linux-next: manual merge of the scsi tree

Hi James,

Today's linux-next merge of the scsi tree got a conflict in
drivers/s390/scsi/zfcp_aux.c and drivers/s390/scsi/zfcp_def.h between
commits 714cd445eab1ba6ec24afaa51665b9c355077bd9 ("s390:
bus_id -> dev_set_name() changes") and
42706c68125c56182cef0ea67e4096bd965e3d42 ("s390: more bus_id -> dev_name
conversions") from the driver-core tree and various commits from the scsi
tree.

I have fixed it up and can carry the fixups, though the dev_set_name and
dev_name conversions could now be applied to the s390 drivers (as I am
sure Greg has supplied patches to do).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/