Merge branch 'ec' into release
authorLen Brown <len.brown@intel.com>
Sat, 19 Sep 2009 06:05:34 +0000 (02:05 -0400)
committerLen Brown <len.brown@intel.com>
Sat, 19 Sep 2009 06:05:34 +0000 (02:05 -0400)
commit762caf0baafc657c410b9c04f4a95d4e3aa4dda1
tree67f40220c61c2ad5ad7b1f063337942157c33027
parent3b87bb640e77023c97cf209e3dd85887a1113ad0
parentf25752e67d9d9ee7562ae9944314dd8c057d3fa2
Merge branch 'ec' into release

Conflicts:
drivers/acpi/ec.c

Signed-off-by: Len Brown <len.brown@intel.com>
drivers/acpi/ec.c