From: Linus Torvalds Date: Fri, 24 Dec 2010 20:58:43 +0000 (-0800) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6 X-Git-Tag: v2.6.37-rc8~17 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=08da5a32b7789289f48f3037b64df2945b5dafc2;p=platform%2Fkernel%2Flinux-stable.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] fix up documentation for change in ->queuecommand to lockless calling [SCSI] bfa: rename log_level to bfa_log_level --- 08da5a32b7789289f48f3037b64df2945b5dafc2