Subject: linux-next: manual merge of the driver-core tree

From: Stephen Rothwell <[email-masked]>
Date: Fri, 18 Jul 2008 11:02:59 +1000

Hi Greg,

Today's linux-next merge of the driver-core tree got a conflict in
drivers/s390/cio/qdio.c between commit
779e6e1c724d30e0fd1baca78b852e41e3a23c1d ("[S390] qdio: new qdio
driver.") from Linus' tree and commit
00bcc6c6a1b34a65803e997a142470531b0b4213 ("s390: bus_id -> dev_name
conversions") from the driver-core tree.

The former commit split the file into a set of other files (and removed
the original). I am guessing that there may be now some more dev_name
updates to be done.

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