From: Olof Johansson Date: Tue, 11 Jun 2013 07:31:45 +0000 (-0700) Subject: Merge branch 'next/soc' into for-next X-Git-Tag: next-20130617~16^2~43 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=c9dfa116f295943f33b4c6a65377c408ed445c9d;p=karo-tx-linux.git Merge branch 'next/soc' into for-next * next/soc: (157 commits) ARM: shmobile: sh73a0: div4 clocks must check the kick bit before changing rate ARM: shmobile: sh73a0: do not overwrite all div4 clock operations ARM: shmobile: sh73a0: Always use shmobile_setup_delay() ARM: shmobile: sh73a0: add CPUFreq support ARM: shmobile: sh73a0: add support for adjusting CPU frequency ARM: shmobile: r8a7790: add TPU PWM support ARM: shmobile: r8a7790: Make private clock arrays static ARM: shmobile: r8a7790: add div6 clocks ARM: shmobile: r8a7790: add div4 clocks ARM: shmobile: r8a7790: add main clock ARM: shmobile: r8a7778: Register SDHI device ARM: shmobile: r8a7778: add SDHI clock support ARM: shmobile: r8a7778: use fixed ratio clock ARM: shmobile: r8a7779: Add PCIe clocks ARM: shmobile: r8a73a4: add div6 clocks ARM: shmobile: r8a73a4: add div4 clocks ARM: shmobile: r8a73a4: add pll clocks ARM: shmobile: r8a73a4: add main clock ARM: shmobile: r8a7740: add TPU PWM support ARM: shmobile: r8a7740: Add I2C DT clock names ... Signed-off-by: Olof Johansson --- c9dfa116f295943f33b4c6a65377c408ed445c9d diff --cc arch/arm/arm-soc-for-next-contents.txt index 771bfd33b54d,000000000000..126123bb3b62 mode 100644,000000..100644 --- a/arch/arm/arm-soc-for-next-contents.txt +++ b/arch/arm/arm-soc-for-next-contents.txt @@@ -1,86 -1,0 +1,89 @@@ +for-next contents for 3.11: +Format is a little different from before in an attempt to make it easier to read: + + + + + <...> + <...> + +depends/rmk-devel-stable + http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-arm.git devel-stable + +next/fixes-non-critical + mvebu/fixes-non-critical + git://git.infradead.org/users/jcooper/linux.git tags/fixes-non-3.11-1 + sirf/fixes-non-critical + git://gitorious.org/sirfprima2-kernel/sirfprima2-kernel.git tags/sirf-arm-soc-v3.10-fixes + +next/cleanup + at91/cleanup + git://github.com/at91linux/linux-at91.git tags/at91-cleanup + machdesc/cleanup + git://github.com/mripard/linux.git tags/arm-soc-cleanups-for-3.11 + mvebu/cleanup + git://git.infradead.org/users/jcooper/linux.git tags/cleanup-3.11-3 + dt/pci-helpers + git://git.infradead.org/users/jcooper/linux.git tags/of_pci-3.11 + +next/soc + mvebu/soc + git://git.infradead.org/users/jcooper/linux.git tags/soc-3.11-2 + mvebu/defconfig + git://git.infradead.org/users/jcooper/linux.git tags/defconfig-3.11-3 + mvebu/pcie + git://git.infradead.org/users/jcooper/linux.git tags/pcie-3.11-2 + mvebu/pcie-kirkwood + git://git.infradead.org/users/jcooper/linux.git tags/pcie_kw-3.11 + mvebu/pcie2 + git://git.infradead.org/users/jcooper/linux.git tags/pcie_bridge-3.11 + mvebu/clk-cleanup + git://git.infradead.org/users/jcooper/linux.git tags/seb_clk-3.11 + vexpress/dual-cluster + git://git.linaro.org/people/nico/linux VExpress_DCSCB + depends on depends/rmk-devel-stable + +patch "drivers/bus: arm-cci: fix combined ARMv6+v7 build" + zynq/clk + git://git.xilinx.com/linux-xlnx tags/zynq-clk-for-3.11 + mvebu/pcie-kirkwood2 + git://git.infradead.org/users/jcooper/linux.git tags/pcie_kw-3.11-2 - ++ renesas/pinmux-gpio ++ git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-pinmux-for-v3.11 ++ renesas/soc ++ git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-soc-for-v3.11 + +next/boards + mvebu/boards + git://git.infradead.org/users/jcooper/linux.git tags/boards-3.11-2 + renesas/defconfig + git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-defconfig-for-v3.11 + +next/dt + nomadik/dt + git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik.git tags/nomadik-dt-for-arm-soc + mvebu/dt + git://git.infradead.org/users/jcooper/linux.git tags/dt-3.11-3 + patch + "ARM: nomadik: fix clocksource warning" + at91/dt + git://github.com/at91linux/linux-at91.git tags/at91-dt + vt8500/dt + git://github.com/linux-wmt/linux-vtwm vt8500/dts-3.11 + cleanup/dts-cpus + git://linux-arm.org/linux-2.6-lp dts-cpus-updates + patch + "ARM: dts: add missing cpu #address-cell values" + mvebu/dt4 + git://git.infradead.org/users/jcooper/linux.git tags/dt-3.11-4 + renesas/dt + git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-dt-for-v3.11 + +next/drivers + ux500/dma40 + git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git tags/ux500-dma40-for-arm-soc + +next/mailbox: + mailbox/subsystem + git://github.com/sumananna/mailbox.git dbx500-prcmu-mailbox + +