Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 4 Mar 2012 00:42:30 +0000 (16:42 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 4 Mar 2012 00:42:30 +0000 (16:42 -0800)
SCSI fixes from James Bottomley:
 "There's just a single fix in here: the osd max device number fix."

* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6:
  [SCSI] osd_uld: Bump MAX_OSD_DEVICES from 64 to 1,048,576


Trivial merge