Merge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Thu, 18 Aug 2005 22:16:12 +0000 (15:16 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Thu, 18 Aug 2005 22:16:12 +0000 (15:16 -0700)
commit91aa9fb573fcc50bc74d5ee64c7e9b36131f1804
treeafa2160e4b611f2991c09a6d6dc6079e47105605
parent5fdf193b15a08f6c32ca4eb5913fa9be788e790e
parent84f57fbc724e3b56dc87c37dddac89f82cf75ef6
Merge /pub/scm/linux/kernel/git/bart/ide-2.6