Merge branch 'stable/for-x86-for-3.4' of git://git.kernel.org/pub/scm/linux/kernel...
authorLen Brown <len.brown@intel.com>
Thu, 22 Mar 2012 05:31:09 +0000 (01:31 -0400)
committerLen Brown <len.brown@intel.com>
Thu, 22 Mar 2012 05:31:09 +0000 (01:31 -0400)
commite840dfe334b4791af07aadee1b2cf3c7c7363581
treeb0f8336f578cb6d3e39399f6714b8ec811536225
parentc16fa4f2ad19908a47c63d8fa436a1178438c7e7
parenta1f37788a6d8c037e7d92fe4a0fe9ec0d713b21e
Merge branch 'stable/for-x86-for-3.4' of git://git./linux/kernel/git/konrad/xen into tboot
drivers/acpi/acpica/hwsleep.c
drivers/acpi/osl.c
include/linux/acpi.h