Merge branches 'acpi_pad', 'acpica', 'apei-bugzilla-43282', 'battery', 'cpuidle-coupl...
authorLen Brown <len.brown@intel.com>
Thu, 26 Jul 2012 04:03:58 +0000 (00:03 -0400)
committerLen Brown <len.brown@intel.com>
Thu, 26 Jul 2012 04:03:58 +0000 (00:03 -0400)

Trivial merge