Merge tag 'omap-for-v3.10/fixes-pm-signed' of git://git.kernel.org/pub/scm/linux...
authorArnd Bergmann <arnd@arndb.de>
Tue, 9 Apr 2013 13:14:19 +0000 (15:14 +0200)
committerArnd Bergmann <arnd@arndb.de>
Tue, 9 Apr 2013 13:14:19 +0000 (15:14 +0200)
commitf199ab1aab9d790bee6c84bdb476f1e4911b8011
treec7f3f75b78f3af375f7e3c60fd479a942578591f
parent6fa6183aefcdefe0db26a0ceeaaf11c149acd449
parent5e7deed71290136cf70944e158f40401d0eed784
Merge tag 'omap-for-v3.10/fixes-pm-signed' of git://git./linux/kernel/git/tmlind/linux-omap into next/cleanup

From Tony Lindgren <tony@atomide.com>:

Non-critical PM fix via Kevin Hilman <khilman@linaro.org>:

OMAP PM fixes for v3.10

Note that this has a dependency to omap-for-v3.10/cleanup-v2-signed.

* tag 'omap-for-v3.10/fixes-pm-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: OMAP4+: PM: Restore CPU power state to ON with clockdomain force wakeup method

Signed-off-by: Arnd Bergmann <arnd@arndb.de<
arch/arm/mach-omap2/omap-smp.c