projects / GitHub / MotorolaMobilityLLC / kernel-slsi.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e0fd9af e689cf0)
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)
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
1  2 
drivers/scsi/libsas/sas_expander.c patch | diff1 | diff2 | blob | history
drivers/scsi/lpfc/lpfc_init.c patch | diff1 | diff2 | blob | history
drivers/scsi/qla2xxx/qla_os.c patch | diff1 | diff2 | blob | history
drivers/scsi/scsi_debug.c patch | diff1 | diff2 | blob | history
drivers/scsi/sd.c patch | diff1 | diff2 | blob | history

diff --cc drivers/scsi/libsas/sas_expander.c
Simple merge
diff --cc drivers/scsi/lpfc/lpfc_init.c
Simple merge
diff --cc drivers/scsi/qla2xxx/qla_os.c
Simple merge
diff --cc drivers/scsi/scsi_debug.c
Simple merge
diff --cc drivers/scsi/sd.c
Simple merge
Motorola kernel-slsi