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)
1  2 
drivers/scsi/Makefile

Simple merge