Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into rmobile-latest

Conflicts:
	arch/arm/mach-shmobile/Makefile

Signed-off-by: Paul Mundt <lethal@linux-sh.org>

1 files changed, 9 insertions, 0 deletions

diff --git a/arch/powerpc/platforms/pseries/Kconfig b/arch/powerpc/platforms/pseries/Kconfig
index c81f6bb9c10f..ae7b6d41fed3 100644
--- a/arch/powerpc/platforms/pseries/Kconfig
+++ b/arch/powerpc/platforms/pseries/Kconfig
@@ -120,3 +120,12 @@ config DTL
           which are accessible through a debugfs file.
 
           Say N if you are unsure.
+
+config PSERIES_IDLE
+        tristate "Cpuidle driver for pSeries platforms"
+        depends on CPU_IDLE
+        depends on PPC_PSERIES
+        default y
+        help
+          Select this option to enable processor idle state management
+          through cpuidle subsystem.