Merge branch 'pm-domains' into pm-for-linus
Rafael J. Wysocki [Fri, 21 Oct 2011 22:21:52 +0000 (00:21 +0200)]
* pm-domains:
  ARM: mach-shmobile: sh7372 A4R support (v4)
  ARM: mach-shmobile: sh7372 A3SP support (v4)
  PM / Sleep: Mark devices involved in wakeup signaling during suspend

1  2 
drivers/base/power/main.c
include/linux/pm.h

Simple merge
Simple merge