Messages in this thread | | | Date | Tue, 27 Nov 2012 15:44:30 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the arm-soc tree with the slave-dma tree |
| |
Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in arch/arm/mach-spear13xx/spear1310.c between commit b47394911c26 ("ARM: SPEAr13xx: Pass DW DMAC platform data from DT") from the slave-dma tree and commit 300a6856324a ("ARM: SPEAr1310: Fix AUXDATA for compact flash controller") from the arm-soc tree.
I have no idea how to fix this up, so I just effectively dropped the arm-doc tree patch.
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au [unhandled content-type:application/pgp-signature] | |