Messages in this thread | | | Date | Wed, 2 May 2012 00:56:24 +0200 | Subject | Re: linux-next: manual merge of the arm-soc tree with the mfd tree | From | Linus Walleij <> |
| |
On Tue, May 1, 2012 at 7:34 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Today's linux-next merge of the arm-soc tree got a conflict in > drivers/mfd/ab5500-core.c between commit 9ea969f0d79d ("mfd: Mark const > init data with __initconst instead of __initdata for ab5500") from the > mfd tree and commit f76facc2354b ("mfd/ab5500: delete AB5500 support") > from the arm-soc tree. > > The latter removes the file, so I did that.
That's correct, thanks!
Linus Walleij
| |