]> nv-tegra.nvidia Code Review - linux-3.10.git/commitdiff
Merge branch 'upstream' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev
authorLinus Torvalds <torvalds@evo.osdl.org>
Mon, 5 Sep 2005 12:50:36 +0000 (05:50 -0700)
committerLinus Torvalds <torvalds@evo.osdl.org>
Mon, 5 Sep 2005 12:50:36 +0000 (05:50 -0700)

Trivial merge