Merge branch 'ec' into test
authorLen Brown <len.brown@intel.com>
Thu, 23 Oct 2008 03:27:59 +0000 (23:27 -0400)
committerLen Brown <len.brown@intel.com>
Thu, 23 Oct 2008 03:27:59 +0000 (23:27 -0400)
commit0fbb3726f246aadd1bebc01114100b6e69afa5b9
tree87e0ca2d5904df9e12e8b7b1d2b303b17758c70a
parent47bf31adc541bef0c20de15e800e0011f1ae70c7
parentc0ff17720ec5f42205b3d2ca03a18da0a8272976
Merge branch 'ec' into test
drivers/acpi/bus.c
drivers/acpi/ec.c
drivers/acpi/scan.c
include/acpi/acpi_drivers.h