From: Linus Torvalds Date: Tue, 29 Jul 2008 01:13:48 +0000 (-0700) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=a3ad7f128c637b7612ebeacb1f85fec933bb1195;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git Merge git://git./linux/kernel/git/jejb/scsi-rc-fixes-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6: [SCSI] qla2xxx: fix msleep compile error --- a3ad7f128c637b7612ebeacb1f85fec933bb1195