Subject: linux-next: mmc/driver-core merge conflict

From: Stephen Rothwell <[email-masked]>
Date: Fri, 6 Jun 2008 15:56:55 +1000

Hi Pierre, Greg,

Today's linux-next merge of the mmc tree got a conflict in
drivers/mmc/host/mmc_spi.c between commit
b16fa5e051064488f241647a080271f1cd41d077 ("driver-core: prepare for
removal of 20 char limit from struct device") from the driver-core tree
and commit cd3c93fe826def37abc474e7a91bbf56444d7cd0 ("mmc_spi: add
support for card-detection polling") from the mmc tree.

I fixed it up in the obvious manner.  Could be fixed by moving the
drivers/mmc/host/mmc_spi.c part of the driver-core change to the mmc
tree ...

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