Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-for-linus-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Fri, 11 Nov 2005 22:04:37 +0000 (14:04 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Fri, 11 Nov 2005 22:04:37 +0000 (14:04 -0800)
commitd72d6f1b5647258e83819b51f72fe37e2b7d7965
treed3a08af50624d9b3e2287367b7e9f5fcc93bdce5
parent33ddcbbfb1d9f1bf1259531ae0ba8400ea3c8ba1
parent8a87a0b6313109d2fea87b1271d497c954ce2ca8
Merge /linux/kernel/git/jejb/scsi-for-linus-2.6
include/linux/libata.h