Messages in this thread | | | Date | Wed, 28 Dec 2011 10:33:41 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the s5p tree with the arm-current tree |
| |
Hi Kukjin,
Today's linux-next merge of the s5p tree got a conflict in arch/arm/common/pl330.c between commit abb959f8a3f1 ("ARM: 7237/1: PL330: Fix driver freeze") from the arm-current tree and commit 5f3f34eb0ed2 ("DMA: PL330: Merge PL330 driver into drivers/dma/") from the s5p tree.
The latter removed the file and merged it into drivers/dma/pl330.c. There may be further fixups requires to that file. I just removed arch/arm/common/pl330.c. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ [unhandled content-type:application/pgp-signature] | |