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)
commit8482a0abe94e535bca25d22f8d46bbecbfe1f132
tree14dc34d6a8b9d9de016afa2ad5228e5068cf0895
parent233ba2c5ffcf83f3dee3f4451724273f76cb7d8b
parent41f8ad76362e7aefe3a03949c43e23102dae6e0b
Merge tag 'scsi-fixes' of git://git./linux/kernel/git/jejb/scsi-rc-fixes-2.6

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