Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Sat, 14 Jan 2006 20:16:07 +0000 (12:16 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sat, 14 Jan 2006 20:16:07 +0000 (12:16 -0800)
commit12dbf3fc4d06d2c0c4c44dc0612df04248b3cfd3
tree158610ef6c7711afb60d78956ab4b131bf6a08ef
parent61b7efddc5256225099d13185659e9ad9d8abc8a
parentfc091e03820bf67e543362bd40959701a71d0c27
Merge /pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
drivers/scsi/Makefile