Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 20 Oct 2010 20:13:09 +0000 (13:13 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 20 Oct 2010 20:13:09 +0000 (13:13 -0700)
* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6:
  [SCSI] bsg: fix incorrect device_status value
  [SCSI] Fix VPD inquiry page wrapper


Trivial merge