lkml.org 
[lkml]   [2012]   [Apr]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-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]
\
 
 \ /
  Last update: 2012-04-17 05:37    [from the cache]
©2003-2011 Jasper Spaans