Merge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Fri, 18 Nov 2005 23:58:38 +0000 (15:58 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Fri, 18 Nov 2005 23:58:38 +0000 (15:58 -0800)
commitb286e39207237e2f6929959372bf66d9a8d05a82
tree0a88ef7c8a91b8cd1afbb85d4b60c9452cc0770e
parentbcb6ad1f5adb267c7b509f83e8edb16cc59d8500
parent6593178dd46d64a5bcb0402a4f3acd95b0687abd
Merge /pub/scm/linux/kernel/git/bart/ide-2.6