From: Olof Johansson Date: Wed, 4 Dec 2013 00:51:00 +0000 (-0800) Subject: Merge branch 'next/cleanup' into for-next X-Git-Tag: next-20131210~98^2~13 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=843c4815995f56b5e418e446fd474156ef5be127;p=karo-tx-linux.git Merge branch 'next/cleanup' into for-next * next/cleanup: ARM: shmobile: sh7372: tidyup clock table order ARM: shmobile: r7s72100: tidyup clock table order ARM: shmobile: sh73a0: tidyup clock table order ARM: shmobile: r8a7779: cleanup registration of sh_eth ARM: shmobile: r8a7790: Correct typo in clocks ARM: shmobile: r8a7779: camera-rcar header cleanup ARM: shmobile: Add r8a7790_register_pfc() function ARM: shmobile: Cosmetic update of Lager DT Reference ARM: shmobile: r8a7779: cleanup registration of VIN ARM: shmobile: bockw: header cleanup ARM: shmobile: sh73a0: don't use named resource for IPMMU ARM: shmobile: sh73a0: don't use named resource for I2C ARM: shmobile: sh73a0: don't use named resource for TMU ARM: shmobile: lager: don't use named resource for MMCIF ARM: shmobile: ape6evm: don't use named resource for SDHI ARM: shmobile: ape6evm: don't use named resource for MMCIF Signed-off-by: Olof Johansson --- 843c4815995f56b5e418e446fd474156ef5be127 diff --cc arch/arm/arm-soc-for-next-contents.txt index 830c5b53f566,000000000000..391f4cf54668 mode 100644,000000..100644 --- a/arch/arm/arm-soc-for-next-contents.txt +++ b/arch/arm/arm-soc-for-next-contents.txt @@@ -1,12 -1,0 +1,16 @@@ +Contents of arm-soc branches contained in for-next + + ++next/cleanup ++ renesas/cleanup ++ git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-cleanup-for-v3.14 ++ +next/soc + patches + ARM: ep93xx: remove deprecated IRQF_DISABLED + ARM: ep93xx: use soc bus + +next/dt + ux500/dt + git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson tags/ux500-devicetree-v3.14-1 +