Re: linux-next: manual merge of the omap tree with the tree

2010-03-01 Thread Tony Lindgren
* Stephen Rothwell [100228 16:17]: > Hi all, > > Today's linux-next merge of the omap tree got a conflict in > arch/arm/plat-omap/Kconfig between commit > d6d502fa4be1acd01971476fc732c95a4da16d90 ("ARM: 5952/1: ARM: MM: Add > ARM_L1_CACHE_SHIFT_6 for handle inside each ARCH Kconfig") from the arm

linux-next: manual merge of the omap tree with the tree

2010-02-28 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the omap tree got a conflict in arch/arm/plat-omap/Kconfig between commit d6d502fa4be1acd01971476fc732c95a4da16d90 ("ARM: 5952/1: ARM: MM: Add ARM_L1_CACHE_SHIFT_6 for handle inside each ARCH Kconfig") from the arm tree and commits 56213ca4e440c0b6e56a48f5901c55