]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'ux500-cpuidle-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel...
authorArnd Bergmann <arnd@arndb.de>
Wed, 2 May 2012 15:24:55 +0000 (17:24 +0200)
committerArnd Bergmann <arnd@arndb.de>
Wed, 2 May 2012 15:24:55 +0000 (17:24 +0200)
From: Linus Walleij <linus.walleij@linaro.org>

* 'ux500-cpuidle-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson:
  ARM: ux500: add the cpuidle driver for WFI and ARM retention

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

Trivial merge