diff options
author | Rafael J. Wysocki <rjw@sisk.pl> | 2011-10-22 00:21:52 +0200 |
---|---|---|
committer | Rafael J. Wysocki <rjw@sisk.pl> | 2011-10-22 00:21:52 +0200 |
commit | d033e078566faed8c8f59baf97ee57ce2524ef5c (patch) | |
tree | 46a98bf6a555ecbc8178baf6dd3a81553c3c3654 /drivers/acpi | |
parent | 081a9d043c983f161b78fdc4671324d1342b86bc (diff) | |
parent | 382414b93ac1e8ee7693be710e60c83eacc97c6f (diff) | |
download | kernel-common-d033e078566faed8c8f59baf97ee57ce2524ef5c.tar.gz kernel-common-d033e078566faed8c8f59baf97ee57ce2524ef5c.tar.bz2 kernel-common-d033e078566faed8c8f59baf97ee57ce2524ef5c.zip |
Merge branch 'pm-domains' into pm-for-linus
* 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
Diffstat (limited to 'drivers/acpi')
0 files changed, 0 insertions, 0 deletions