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

Simple merge
Simple merge