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)
commit44779149e91ec8e684be23e06dc05197e367a45f
treeef1f38740133466f08d12c0a497333d47ab8f7a4
parent8ee3f402676bf59caa454b7171ae09c8ac136627
parent17514e8a6f1836a5c95b1f18d2bc0493ad732cf0
Merge /pub/scm/linux/kernel/git/bart/ide-2.6