Merge branch 'suspend-ioremap-cache' into release
authorLen Brown <len.brown@intel.com>
Wed, 12 Jan 2011 09:56:08 +0000 (04:56 -0500)
committerLen Brown <len.brown@intel.com>
Wed, 12 Jan 2011 09:56:08 +0000 (04:56 -0500)
commitd16675e1f1de98cc73ae77c6df26154ffae6230a
treebe7ffdaabdaa06f8c917c7a6c9919d4b5fd13a52
parentfb4af417cce9ff87abf33a6bb9a0cf613e285364
parent6d5bbf00d251cc73223a71422d69e069dc2e0b8d
Merge branch 'suspend-ioremap-cache' into release
drivers/acpi/internal.h
drivers/acpi/sleep.c