Merge branch 'misc' into for-linus
authorJames Bottomley <JBottomley@Parallels.com>
Fri, 10 May 2013 14:53:40 +0000 (07:53 -0700)
committerJames Bottomley <JBottomley@Parallels.com>
Fri, 10 May 2013 14:53:40 +0000 (07:53 -0700)
commit832e77bc1106592c621fc42f2f6a4500e414a0a1
tree2b226019e7b1344f05e44d79da956a5306d20780
parente0fd9affeb64088eff407dfc98bbd3a5c17ea479
parente689cf0caf2d5ebcb300fb69887d35c0abdbdb97
Merge branch 'misc' into for-linus

Signed-off-by: James Bottomley <JBottomley@Parallels.com>
drivers/scsi/libsas/sas_expander.c
drivers/scsi/lpfc/lpfc_init.c
drivers/scsi/qla2xxx/qla_os.c
drivers/scsi/scsi_debug.c
drivers/scsi/sd.c