Merge gregkh@master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6
authorGreg Kroah-Hartman <gregkh@suse.de>
Sat, 26 Aug 2006 20:04:23 +0000 (13:04 -0700)
committerGreg Kroah-Hartman <gregkh@suse.de>
Sat, 26 Aug 2006 20:04:23 +0000 (13:04 -0700)

Trivial merge