Merge branch 'acpica' into test
commitbcb631f31839cb7c7dd56ab534b6eb4867e9161b
authorLen Brown <len.brown@intel.com>
Thu, 23 Oct 2008 03:19:51 +0000 (22 23:19 -0400)
committerLen Brown <len.brown@intel.com>
Thu, 23 Oct 2008 03:19:51 +0000 (22 23:19 -0400)
treed86336c9cfb22e4af69fbe73c94299a775ecc220
parent955ba395616a78780e70dc3f3b0b56ca4db52e5c
parented37a71eac8ba375d85ab10ed5f5e8bdf1cd72e0
Merge branch 'acpica' into test
drivers/acpi/processor_perflib.c
drivers/acpi/scan.c