linux-next: manual merge of the arm-soc tree with the staging tree
tony at atomide.com
Wed Oct 31 12:23:15 EDT 2012
* Greg KH <greg at kroah.com> [121031 09:17]:
> On Wed, Oct 31, 2012 at 04:19:21PM +1100, Stephen Rothwell wrote:
> > Hi all,
> > Today's linux-next merge of the arm-soc tree got a conflict in
> > arch/arm/mach-omap2/drm.c between commit 5e3b08749951 ("staging:
> > drm/omap: add support for ARCH_MULTIPLATFORM") from the staging tree and
> > commit 2a296c8f89bc ("ARM: OMAP: Make plat/omap_hwmod.h local to
> > mach-omap2") from the arm-soc tree.
> > I fixed it up (see below) and can carry the fix as necessary (no action
> > is required).
> Looks good to me, thanks for this.
More information about the linux-arm-kernel