Messages in this thread | | | Date | Thu, 7 Jan 2010 14:16:13 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the mfd tree with the tmio-mmc tree |
| |
Hi Samuel,
Today's linux-next merge of the mfd tree got conflicts in drivers/mfd/asic3.c, drivers/mfd/t7l66xb.c, drivers/mfd/tc6387xb.c, drivers/mfd/tc6393xb.c, drivers/mfd/tmio_core.c, drivers/mmc/host/tmio_mmc.c, drivers/mmc/host/tmio_mmc.h and include/linux/mfd/tmio.h between commit 4cd83bd05e6c817a4a72ababd82bf5ae700c021d ("MMC: hardware abstraction for CNF area") from the tmio-mmc tree and commit b3df6513659704ece28da3b80cc36c2a8de315ce ("mfd: tmio_mmc hardware abstraction for CNF area") from the mfd tree.
These are very similar patches, I used the version from the mfd tree as that appears to be a later version. Can you and Ian please sort this out between you. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ [unhandled content-type:application/pgp-signature] | |