From: Kevin Hilman Date: Thu, 17 Oct 2013 21:43:10 +0000 (-0700) Subject: Merge branch 'next/soc' into for-next X-Git-Tag: next-20131021~21^2~17 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=e2bc64484c857cf54be5d4773f6df7cf7487a09b;p=karo-tx-linux.git Merge branch 'next/soc' into for-next * next/soc: ARM: integrator: core module registers from compatible strings ARM: integrator: use devm_ioremap() to remap CM cpufreq: probe the Integrator cpufreq driver from DT ARM: integrator: move CM base into device tree ARM: integrator: decommission the header ARM: integrator: delete non-devicetree boot path ARM: integrator: print the Linux IRQ in LL_DEBUG code ARM: integrator: get the LM interrupts from DT ARM: integrator: update defconfig ARM: integrator: get the CM control register by proxy Signed-off-by: Kevin Hilman --- e2bc64484c857cf54be5d4773f6df7cf7487a09b diff --cc arch/arm/arm-soc-for-next-contents.txt index a932ee766d48,000000000000..2e048b93ae7e mode 100644,000000..100644 --- a/arch/arm/arm-soc-for-next-contents.txt +++ b/arch/arm/arm-soc-for-next-contents.txt @@@ -1,83 -1,0 +1,85 @@@ + + +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 + patch + ARM: drop explicit selection of HAVE_CLK and CLKDEV_LOOKUP + reneasas/initdata-cleanup + git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-fixes5-for-v3.12 + renesas/cleanup + git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-cleanup-for-v3.13 + patch + clk: nomadik: fix missing __init on nomadik_src_init + renesas/cleanup2 + git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-cleanup2-for-v3.13 + patch + ARM: clps711x: Use linux/sched_clock.h + ARM: Remove temporary sched_clock.h header + +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 + renesas/soc + git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-soc-for-v3.13 + renesas/smp + git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-smp-for-v3.13 + renesas/soc2 + git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-soc2-for-v3.13 + keystone/soc + git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone.git tags/keystone-soc-for-arm-soc + patch + ARM: keystone: fix PM domain initcall to be keystone only + omap/hwmod + git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.13/hwmod-signed + omap/soc + git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.13/soc-take2 + davinci/soc + git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci.git tags/davinci-for-v3.13/soc-2 # rebased from -v3.12-rc5 to -rc3 ++ integrator/soc ++ git fetch git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator.git tags/integrator-for-v3.13-2 + +next/drivers + davinci/gpio + git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci.git tags/davinci-for-v3.13/gpio + mvebu/drivers + git://git.infradead.org/linux-mvebu.git tags/drivers-3.13 + arm/drivers + git://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git tags/arm-perf-3.13 + +next/boards + renesas/boards + git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git renesas-boards-for-v3.13 + renesas/defconfig + git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-defconfig-for-v3.13 + renesas/boards2 + git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-boards2-for-v3.13 + omap/boards + git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.13/board-signed + +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" + ux500/dt2 + git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git tags/ux500-devicetree-2 + renesas/dt + git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-dt-for-v3.13 + mvebu/dt + git://git.infradead.org/linux-mvebu.git tags/dt-3.13 + mvebu/dt2 + git://git.infradead.org/linux-mvebu.git tags/dt-3.13-2 + renesas/dt2 + git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-dt2-for-v3.13 + socfpga/dt + git://git.rocketboards.org/linux-socfpga-next.git tags/socfpga-dts-updates-for-v3.13 + omap/pdata-quirks + git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.13/quirk-signed + omap/dt + git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.13/dt-signed