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)
commitb9b6b7ae964582ac9cf8dbad9127a4cccfd30751
tree24ad1d18a70945f94a43f533c8c6cdc22acb8c09
parent66f75a5d028beaf67c931435fdc3e7823125730c
parent3ebabaa534c79a54c11a4ec1a81e62b76a4ada0c
Merge branch 'ux500-cpuidle-for-arm-soc' of git://git./linux/kernel/git/linusw/linux-stericsson into next/cpuidle

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>