]> pilppa.com Git - linux-2.6-omap-h63xx.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)
commit81b7bbd1932a04869d4c8635a75222dfc6089f96
tree285ae868a1e3a41fb0dbfe346c28e380949bcb55
parent98051995ab44b993f992946055edc6115351f725
parent66efc5a7e3061c3597ac43a8bb1026488d57e66b
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