linux-next: manual merge of the mvebu tree with Linus' tree
jason at lakedaemon.net
Mon Jun 23 05:21:00 PDT 2014
On Mon, Jun 23, 2014 at 10:57:41AM +1000, Stephen Rothwell wrote:
> Hi all,
> Today's linux-next merge of the mvebu tree got a conflict in
> arch/arm/mach-mvebu/Kconfig between commit 21278aeafbfa ("ARM: use
> menuconfig for sub-arch menus") from Linus' tree and commit
> 55fc83023212 ("ARM: Kirkwood: Add setup file for netxbig LEDs") from
> the mvebu tree.
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
Looks good. Thanks Stephen.
More information about the linux-arm-kernel