diff options
author | Olof Johansson <olof@lixom.net> | 2013-06-15 03:11:31 +0200 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2013-06-15 03:11:31 +0200 |
commit | 7bf15412250747277cc53301d550d4894f749b12 (patch) | |
tree | 6362b5b4d68a5eb641981b0f64d472b970d03ff5 /fs/xfs/xfs_btree.c | |
parent | Merge tag 'renesas-soc2-for-v3.11' of git://git.kernel.org/pub/scm/linux/kern... (diff) | |
parent | ARM: tegra: don't pass CPU ID to tegra_{set,clear}_cpu_in_lp2 (diff) | |
download | linux-7bf15412250747277cc53301d550d4894f749b12.tar.xz linux-7bf15412250747277cc53301d550d4894f749b12.zip |
Merge tag 'tegra-for-3.11-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra into next/soc
From Stephen Warren:
ARM: tegra: core SoC support enhancements
This branch contains fixes and enhancement for core Tegra Soc support:
* CPU hotplug support for Tegra114.
* Some preliminary work on Tegra114 CPU sleep modes.
* Minor fix for EMC table DT parsing.
* tag 'tegra-for-3.11-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra:
ARM: tegra: don't pass CPU ID to tegra_{set,clear}_cpu_in_lp2
ARM: tegra: cpuidle: using IS_ENABLED for multi SoCs management in init func
ARM: tegra: hook tegra_tear_down_cpu function in the PM suspend init function
ARM: tegra: cpuidle: move the init function behind the suspend init function
ARM: tegra: remove ifdef in the tegra_resume
ARM: tegra: add cpu_disable for hotplug
ARM: tegra114: add CPU hotplug support
clk: tegra114: implement wait_for_reset and disable_clock for tegra_cpu_car_ops
ARM: tegra114: add power up sequence for warm boot CPU
ARM: tegra: make tegra_resume can work for Tegra114
ARM: tegra: skip SCU and PL310 code when CPU is not Cortex-A9
ARM: tegra: add an assembly marco to check Tegra SoC ID
ARM: tegra: emc: correction of ram-code parsing from dt
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'fs/xfs/xfs_btree.c')
0 files changed, 0 insertions, 0 deletions