]> nv-tegra.nvidia Code Review - linux-2.6.git/commitdiff
Merge branch 'upstream' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev
authorLinus Torvalds <torvalds@g5.osdl.org>
Thu, 5 Jan 2006 00:32:33 +0000 (16:32 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Thu, 5 Jan 2006 00:32:33 +0000 (16:32 -0800)

Trivial merge