Merge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Sun, 20 Nov 2005 00:31:03 +0000 (16:31 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sun, 20 Nov 2005 00:31:03 +0000 (16:31 -0800)

Trivial merge