Merge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6
commit7116317dc9148d783846299fc80a7d377baa6dca
authorLinus Torvalds <torvalds@g5.osdl.org>
Thu, 15 Dec 2005 02:58:46 +0000 (14 18:58 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Thu, 15 Dec 2005 02:58:46 +0000 (14 18:58 -0800)
tree55616e245d7e6f509753d06da03c7b8c4e3896f7
parent2499604960fff307fe99ff4d4363c50eaa69235a
parent0afaa4fc4abc773ce129f41009a50eeecf3aa50c
Merge /pub/scm/linux/kernel/git/bart/ide-2.6