projects / GitHub / moto-9609 / android_kernel_motorola_exynos9610.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9805199 66efc5a)
Merge branch 'linus'
authorJames Bottomley <jejb@mulgrave.il.steeleye.com>
Sat, 10 Feb 2007 19:45:43 +0000 (13:45 -0600)
committerJames Bottomley <jejb@mulgrave.il.steeleye.com>
Sat, 10 Feb 2007 19:45:43 +0000 (13:45 -0600)
Conflicts:

drivers/scsi/ipr.c

Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
1  2 
drivers/s390/scsi/zfcp_erp.c patch | diff1 | diff2 | blob | history
drivers/s390/scsi/zfcp_ext.h patch | diff1 | diff2 | blob | history
drivers/s390/scsi/zfcp_fsf.c patch | diff1 | diff2 | blob | history
drivers/scsi/scsi_scan.c patch | diff1 | diff2 | blob | history
drivers/scsi/st.c patch | diff1 | diff2 | blob | history

diff --cc drivers/s390/scsi/zfcp_erp.c
Simple merge
diff --cc drivers/s390/scsi/zfcp_ext.h
Simple merge
diff --cc drivers/s390/scsi/zfcp_fsf.c
Simple merge
diff --cc drivers/scsi/scsi_scan.c
Simple merge
diff --cc drivers/scsi/st.c
Simple merge