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)
1  2 
drivers/acpi/internal.h
drivers/acpi/sleep.c

Simple merge
Simple merge