Subject: linux-next: manual merge of the s390 tree

From: Stephen Rothwell <[email-masked]>
Date: Tue, 24 Jun 2008 13:45:46 +1000

Hi Martin, Greg,

Today's linux-next merge of the s390 tree got a conflict in
drivers/s390/cio/qdio.c between commit
4836b98e1d4c0b5e86ce4e071321367cf28885c4 ("s390: bus_id -> dev_name
conversions") from the driver-core tree and commit
bc3817177fc931f0ade32808e4cb61be2f0999fb ("[S390] qdio: Repair timeout
handling for qdio_shutdown") from the s390 tree.

It is a simple near overlap of changes, and I fixed it up.  I can carry
the fixup.

-- 
Cheers,
Stephen Rothwell                    [email-masked]
http://www.canb.auug.org.au/~sfr/