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)
* 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


Trivial merge