Merge branch 'ec-cleanup' into release
authorLen Brown <len.brown@intel.com>
Sun, 29 May 2011 08:40:39 +0000 (04:40 -0400)
committerLen Brown <len.brown@intel.com>
Sun, 29 May 2011 08:40:39 +0000 (04:40 -0400)
commit751516f0a9bad32544f40f471037c0e45fb639c9
tree8bdd745909a1523f720ae978c12b9c686d58baaa
parent6288cf1e768ae73db5ddaaae54d85245cc1c2b56
parent08b53f0e6b565fe8dc0b8f929960ed16d76291bd
Merge branch 'ec-cleanup' into release

Conflicts:
drivers/platform/x86/compal-laptop.c
drivers/acpi/ec.c
drivers/platform/x86/compal-laptop.c
drivers/platform/x86/msi-laptop.c