linux-next: manual merge of the s5p tree with the arm-current tree
From: Stephen Rothwell
Date: Tue Dec 27 2011 - 18:33:44 EST
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
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
Description: PGP signature