Messages in this thread |  | | | Date | Tue, 17 Apr 2012 13:34:18 +1000 | | From | Stephen Rothwell <> | | Subject | linux-next: manual merge of the arm-soc tree with the mfd tree |
| |
Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in arch/arm/mach-omap2/board-generic.c between commit aa1d7775696c ("mfd: Convert twl6040 to i2c driver, and separate it from twl core") from the mfd tree and commit 93651b85bbd1 ("ARM: OMAP2+: board-generic: Remove i2c static init") from the arm-soc tree.
The latter seems to supercede the former, so I used that. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au [unhandled content-type:application/pgp-signature] |  |