linux-next: manual merge of the mvebu tree with Linus' tree

Hi all, Today's linux-next merge of the mvebu tree got a conflict in drivers/cpuidle/cpuidle-armada-370-xp.c between commit dc559aabe2d4 ("cpuidle: mvebu: Fix the name of the states") from Linus' tree and commit 742450174037 ("cpuidle: mvebu: rename the driver from armada-370-xp to mvebu-v7") from

linux-next: manual merge of the mvebu tree with Linus' tree

Hi all, Today's linux-next merge of the mvebu tree got a conflict in arch/arm/Kconfig between commit 19682f72f5db ("ARM: Remove ARCH_HAS_CPUFREQ config option") from Linus' tree and commit ba364fc752da ("ARM: Kirkwood: Remove mach-kirkwood") from the mvebu tree. I fixed it up (The latter just rem

Re: linux-next: manual merge of the mvebu tree with Linus' tree

On Mon, Jun 23, 2014 at 10:57:41AM +1000, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the mvebu tree got a conflict in > arch/arm/mach-mvebu/Kconfig between commit 21278aeafbfa ("ARM: use > menuconfig for sub-arch menus") from Linus' tree and commit > 55fc83023212 ("ARM: Kirk

linux-next: manual merge of the mvebu tree with Linus' tree

Hi all, Today's linux-next merge of the mvebu tree got a conflict in arch/arm/mach-mvebu/Kconfig between commit 21278aeafbfa ("ARM: use menuconfig for sub-arch menus") from Linus' tree and commit 55fc83023212 ("ARM: Kirkwood: Add setup file for netxbig LEDs") from the mvebu tree. I fixed it up (s

linux-next: manual merge of the mvebu tree with Linus' tree

Hi all, Today's linux-next merge of the mvebu tree got a conflict in Documentation/devicetree/bindings/vendor-prefixes.txt between commit d5f93b8ad01e ("of: Update qcom vendor prefix description") from Linus' tree and commit f7f2ea9f49b0 ("DT: Vendor prefixes: Add ricoh, qnap, sii and synology") f