Merge tag 'tegra-for-4.2-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra...
authorArnd Bergmann <arnd@arndb.de>
Wed, 13 May 2015 16:01:18 +0000 (18:01 +0200)
committerArnd Bergmann <arnd@arndb.de>
Wed, 13 May 2015 16:01:18 +0000 (18:01 +0200)
commit2516a932efff0573de271ed3e6ad2327aa34c887
treec4c3487dc2ea37953b7bea39005dacbb91b3cb23
parent94db5b98d0bc56729e8f3cf2e1673017860c4a3a
parent7892158a96629c46c46dfae52eaf951f51222cf5
Merge tag 'tegra-for-4.2-soc' of git://git./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