From: Olof Johansson Date: Mon, 7 Oct 2013 16:49:45 +0000 (-0700) Subject: Merge branch 'next/cleanup' into for-next X-Git-Tag: next-20131017~12^2~27 X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-linux.git;a=commitdiff_plain;h=5316f70add5bb124dafe3a9ef1ae81f455aa32c1 Merge branch 'next/cleanup' into for-next * next/cleanup: (29 commits) ARM: vt8500: remove custom .init_time hook ARM: vexpress: remove custom .init_time hook ARM: tegra: remove custom .init_time hook ARM: sunxi: remove custom .init_time hook ARM: sti: remove custom .init_time hook ARM: socfpga: remove custom .init_time hook ARM: rockchip: remove custom .init_time hook ARM: prima2: remove custom .init_time hook ARM: nspire: remove custom .init_time hook ARM: nomadik: remove custom .init_time hook ARM: mxs: remove custom .init_time hook ARM: kirkwood: remove custom .init_time hook ARM: imx: remove custom .init_time hook ARM: highbank: remove custom .init_time hook ARM: exynos: remove custom .init_time hook ARM: dove: remove custom .init_time hook ARM: bcm2835: remove custom .init_time hook ARM: bcm: provide common arch init for DT clocks ARM: call of_clk_init from default time_init handler ARM: vt8500: prepare for arch-wide .init_time callback ... Signed-off-by: Olof Johansson --- 5316f70add5bb124dafe3a9ef1ae81f455aa32c1 diff --cc arch/arm/arm-soc-for-next-contents.txt index ee82c210c51b,000000000000..bbc1d4c005a8 mode 100644,000000..100644 --- a/arch/arm/arm-soc-for-next-contents.txt +++ b/arch/arm/arm-soc-for-next-contents.txt @@@ -1,23 -1,0 +1,25 @@@ + + +next/cleanup + shark/removal + git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git tags/del-shark-for-v3.13 ++ cleanup/dt-clock ++ https://github.com/shesselba/linux-dove.git clk-of-init-v2_for-3.13 + +next/soc + samsung/s3c64xx-clk + http://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git tags/samsung-clk-s3c64xx + patch + ARM: davinci: remove deprecated IRQF_DISABLED + +next/drivers + davinci/gpio + git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci.git tags/davinci-for-v3.13/gpio + +next/dt + samsung/s3c64xx-dt + http://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git tags/samsung-dt-s3c64xx + ux500/dt + git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git tags/ux500-dt-for-v3.13-2 + patch "ARM: ux500: enable appended dtb in u8500_defconfig" +