Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 24 Dec 2010 20:58:43 +0000 (12:58 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 24 Dec 2010 20:58:43 +0000 (12:58 -0800)
commit08da5a32b7789289f48f3037b64df2945b5dafc2
treecc55fc18248cb6f1fd745c3d5530591810c83203
parenteda4b716ea1f2a647a39cebae66b3fae4c4b80e4
parent29687512c0b084957112cc2c0743ce34cd0d5055
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