]> nv-tegra.nvidia Code Review - linux-2.6.git/commitdiff
Merge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Thu, 15 Dec 2005 02:58:46 +0000 (18:58 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Thu, 15 Dec 2005 02:58:46 +0000 (18:58 -0800)

Trivial merge