diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2015-05-13 18:01:18 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2015-05-13 18:01:18 +0200 |
| commit | 2516a932efff0573de271ed3e6ad2327aa34c887 (patch) | |
| tree | c4c3487dc2ea37953b7bea39005dacbb91b3cb23 /arch/arm/mach-clps711x | |
| parent | 94db5b98d0bc56729e8f3cf2e1673017860c4a3a (diff) | |
| parent | 7892158a96629c46c46dfae52eaf951f51222cf5 (diff) | |
Merge tag 'tegra-for-4.2-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into next/soc
Merge "ARM: tegra: Core SoC changes for v4.2-rc1" from Thierry Reding:
A couple of changes to the core SoC support code. Perhaps the most
important part is a fix for a regression in LP1 suspend/resume code that
was introduced a while back.
* tag 'tegra-for-4.2-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
soc/tegra: pmc: move to using a restart handler
ARM: tegra20: Store CPU "resettable" status in IRAM
soc/tegra: Watch wait_for_completion_timeout() return type
Diffstat (limited to 'arch/arm/mach-clps711x')
0 files changed, 0 insertions, 0 deletions