Messages in this thread | | | Date | Tue, 4 Dec 2012 15:42:03 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the arm-soc tree with the iommu tree |
| |
Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in arch/arm/mach-omap2/clock44xx_data.c between commit 298ea44f211d ("ARM: OMAP4: hwmod data: ipu and dsp to use parent clocks instead of leaf clocks") from the iommu tree and commit 13a5b6228679 ("ARM: OMAP44xx: clock: drop obsolete clock data") from the arm-soc tree.
I just deleted the file as the latter did and can carry the fix as necessary (no action is required).
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ [unhandled content-type:application/pgp-signature] | |