]> nv-tegra.nvidia Code Review - linux-2.6.git/commitdiff
Merge head 'upstream' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev
authorLinus Torvalds <torvalds@g5.osdl.org>
Fri, 29 Jul 2005 16:04:47 +0000 (09:04 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Fri, 29 Jul 2005 16:04:47 +0000 (09:04 -0700)

Trivial merge