Merge branch 'ec-cleanup' into release

Conflicts:
	drivers/platform/x86/compal-laptop.c

diff --cc drivers/acpi/ec.c
Simple merge

diff --cc drivers/platform/x86/compal-laptop.c
index c16a27641cedc57888fcc88b160aabec098520fd,f4f43e65475fa8ed5f66540542b99ffac2aca3e8..9b3afb6f0b136afe88ab089d8111620d46d624a6
--- 1/drivers/platform/x86/compal-laptop.c
--- 2/drivers/platform/x86/compal-laptop.c
+++ b/drivers/platform/x86/compal-laptop.c
@@@ -200,8 -200,8 +200,8 @@@ static bool extra_features
   * watching the output of address 0x4F (do an ec_transaction writing 0x33
   * into 0x4F and read a few bytes from the output, like so:
   *    u8 writeData = 0x33;
-  *    ec_transaction(0x4F, &writeData, 1, buffer, 32, 0);
-  * That address is labelled "fan1 table information" in the service manual.
+  *    ec_transaction(0x4F, &writeData, 1, buffer, 32);
 - * That address is labled "fan1 table information" in the service manual.
++ * That address is labeled "fan1 table information" in the service manual.
   * It should be clear which value in 'buffer' changes). This seems to be
   * related to fan speed. It isn't a proper 'realtime' fan speed value
   * though, because physically stopping or speeding up the fan doesn't

diff --cc drivers/platform/x86/msi-laptop.c
Simple merge