Merge branch 'next/soc' into for-next

* next/soc:
  ARM: tegra20: add CPU hotplug support
  ARM: tegra30: add CPU hotplug support
  ARM: tegra: clean up the common assembly macros into sleep.h
  ARM: tegra: replace the CPU CAR access code by tegra_cpu_car_ops
  ARM: tegra: introduce tegra_cpu_car_ops structures
  ARM: Tegra: Add smp_twd clock for Tegra20
  ARM: tegra: cpu-tegra: explicitly manage re-parenting
  ARM: tegra: fix overflow in tegra20_pll_clk_round_rate()
  ARM: tegra: Fix data type for io address
  ARM: tegra: remove tegra_timer from tegra_list_clks
  ARM: tegra30: clocks: fix the wrong tegra_audio_sync_clk_ops name
  ARM: tegra: clocks: separate tegra_clk_32k_ops from Tegra20 and Tegra30
  ARM: tegra: Remove duplicate code
  ARM: tegra: Port tegra to generic clock framework
  ARM: tegra: Add clk_tegra structure and helper functions
  ARM: tegra: Rename tegra20 clock file
  ARM: tegra20: Separate out clk ops and clk data
  ARM: tegra30: Separate out clk ops and clk data
  ARM: tegra: fix U16 divider range check
  ARM: tegra: turn on UART A clock at boot

diff --cc arch/arm/Kconfig
index fe58ff6bc197744dcca2f92cae00eed0c748ca46,60355f1cc4b4d5f19333bede2dd36914b2683470..337d887c8cfcdd1e11662d94cb8bb9a48477ca74
--- 1/arch/arm/Kconfig
--- 2/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -674,8 -683,10 +674,9 @@@ config ARCH_TEGR
        select HAVE_CLK
        select HAVE_SMP
        select MIGHT_HAVE_CACHE_L2X0
 -      select NEED_MACH_IO_H if PCI
        select ARCH_HAS_CPUFREQ
        select USE_OF
+       select COMMON_CLK
        help
          This enables support for NVIDIA Tegra based systems (Tegra APX,
          Tegra 6xx and Tegra 2 series).

diff --cc arch/arm/arm-soc-for-next-contents.txt
index ff8c24103dc9bbe49935c6a0c17b1137108bbe0b,0000000000000000000000000000000000000000..0a3410e6c12e4d3cb483f0cda4700320618269b4
mode 100644,000000..100644
--- 1/arch/arm/arm-soc-for-next-contents.txt
--- /dev/null
+++ b/arch/arm/arm-soc-for-next-contents.txt
@@@ -1,99 -1,0 +1,101 @@@
 +This file lists all branches that are pulled into the for-next branch
 +of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git
 +and their external dependencies.
 +
 +It also includes a couple of directly applied patches for build breaks with subject
 +The next/* branches are kept in the order in which they get applied.
 +
 +external dependencies:
 +depends/clk-3.7       git://git.linaro.org/people/mturquette/linux.git clk-3.7
 +depends/tps6589x-dt  git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git tps6589x-dt
 +
 +fixes:
 +
 +next/fixes-non-critical:
 +ux500/fixes-non-critical http://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git tags/ux500-core-updates
 +cleanup/of-deviceid-data git://git.pengutronix.de/git/ukl/linux ofdeviceiddata 
 +                              (pulled again on Sep 12)
 +imx/fixes-non-critical         git://git.pengutronix.de/git/imx/linux-2.6.git tags/imx-fixes
 +msm/fixes-non-critical         git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm.git tags/msm-fix-noncrit-for-3.7
 +tegra/fixes-non-critical git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra.git tegra-for-3.7-fixes
 +
 +next/cleanup:
 +cleanup/io-pci:   git://sources.calxeda.com/kernel/linux.git io-cleanup-pci-v2
 +bcmring/cleanup:  patches from Arnd
 +u300/cleanup    git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git u300-cleanup
 +csr/marco-prepare git://gitorious.org/sirfprima2-kernel/sirfprima2-kernel.git marco-prepare
 +                      (includes two patches from clk-next that adds prima2 clocks)
 +pmu/cleanup       git://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git tags/arm-perf-3.7
 +ks8695/timer      http://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git tags/ks8695-time-for-arm-soc
 +                      + http://marc.info/?l=linux-arm-kernel&m=134734253519144
 +renesas/ag5evm    git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git ag5evm
 +nxp4008/removal   git://git.antcom.de/linux-2.6.git pnx4008-removal
 +pxa/clk                 git://github.com/hzhuang1/linux.git clk
 +imx/cleanup     git://git.pengutronix.de/git/imx/linux-2.6.git tags/imx-cleanup
 +msm/cleanup     git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm.git tags/msm-cleanup-for-3.7
 +tegra/cleanup   git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra.git tegra-for-3.7-cleanup
 +tegra/board-removal git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra.git tegra-for-3.7-board-removal
 +                      depends on depends/tps6589x-dt
 +
 +next/maintainers:
 +[email]                 Entry for ks8695 from Arnd
 +tegra/maintainers git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra.git tegra-for-3.7-maintainers
 +
 +next/soc:
 +ux500/asic-id:        git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git ux500-core
 +               + http://marc.info/?l=linux-arm-kernel&m=134667789927502
 +renesas/kzm9g   git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git kzm9g
 +lpc32xx/core  git://git.antcom.de/linux-2.6.git lpc32xx/core
 +renesas/soc   git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git soc
 +renesas/pmu   git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git pmu/cleanup
 +                      depends on pmu/cleanup (next/cleanup)
 +imx/soc               git://git.pengutronix.de/git/imx/linux-2.6.git tags/imx-soc
++tegra/common-clk git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra.git tegra-for-3.7-common-clk
++tegra/cpu-hotplug git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra.git tegra-for-3.7-cpu-hotplug
 +
 +next/dt:
 +pxa/dt:               git://github.com/hzhuang1/linux.git dt
 +renesas/soc-core git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git soc-core
 +csr/pinmux-dt   git://gitorious.org/sirfprima2-kernel/sirfprima2-kernel.git pinmux-dt
 +lpc32xx/dts   git://git.antcom.de/linux-2.6.git lpc32xx/dts
 +mxs/dt                git://git.linaro.org/people/shawnguo/linux-2.6.git tags/mxs-dt-3.7
 +depends/clk-3.7       git://git.linaro.org/people/mturquette/linux.git clk-3.7
 +                      -> this is a prereq for mxs/clk-dt-lookup below
 +mxs/clk-dt-lookup     git://git.linaro.org/people/shawnguo/linux-2.6.git tags/mxs-clk-dt-lookup
 +imx/dt                git://git.linaro.org/people/shawnguo/linux-2.6.git tags/imx-dt-3.7
 +imx/clk-dt-lookup     git://git.linaro.org/people/shawnguo/linux-2.6.git tags/imx-clk-dt-lookup
 +msm/dt                git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm.git tags/msm-dt-for-3.7
 +
 +next/soc2:
 +mxs/sparse-irq        git://git.linaro.org/people/shawnguo/linux-2.6.git tags/mxs-sparse-irq
 +               (functionally depends on mxs/dt)
 +
 +next/defconfig:
 +renesas/defconfig git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git defconfig
 +lpc32xx/defconfig git://git.antcom.de/linux-2.6.git lpc32xx/defconfig
 +mxs/defconfig   git://git.linaro.org/people/shawnguo/linux-2.6.git tags/mxs-defconfig-3.7
 +imx/defconfig   git://git.pengutronix.de/git/imx/linux-2.6.git tags/imx-defconfig
 +
 +next/drivers:
 +devel/led-driver      git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds.git for-arm-soc
 +at91/mci      git://github.com/at91linux/linux-at91 at91-for-next-soc
 +drivers/ocp2scp       patches from Kishon Vijay Abraham I <kishon@ti.com>
 +              + http://marc.info/?l=linux-next&m=134574365000518&w=2
 +
 +next/boards:
 +pxa/board     git://github.com/hzhuang1/linux.git board
 +ks8695/boards <1346995449-5436-1-git-send-email-gerg@snapgear.com> and
 +              <1346996139-5692-1-git-send-email-gerg@snapgear.com>
 +renesas/boards        git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git boards
 +               (pulled twice)
 +pxa/boards    git://github.com/hzhuang1/linux.git board
 +imx/boards    git://git.pengutronix.de/git/imx/linux-2.6.git tags/imx-boards
 +msm/boards    git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm.git tags/msm-board-for-3.7
 +
 +next/docs:
 +mvebu/docs:   git://github.com/MISL-EBU-System-SW/mainline-public.git marvell-doc
 +
 +
 +
 +
 +

diff --cc arch/arm/mach-tegra/Makefile
Simple merge

diff --cc arch/arm/mach-tegra/board-dt-tegra20.c
Simple merge