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)
1  2 
include/linux/libata.h

Simple merge