]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit16a2eaed9faa0451eea590d9acea565098722929
tree285ae868a1e3a41fb0dbfe346c28e380949bcb55
parent771d204620b9b7a0c5b29528686b0470a0cd26e6
parent6f3b59eec45df0455d5e1fdd10c486dac9469af7
Merge branch 'linus'

Conflicts:

drivers/scsi/ipr.c

Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
drivers/s390/scsi/zfcp_erp.c
drivers/s390/scsi/zfcp_ext.h
drivers/s390/scsi/zfcp_fsf.c
drivers/scsi/scsi_scan.c
drivers/scsi/st.c