]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit77732cbe9b4b99eff823711bcb8360e41c71eb86
tree8bdd745909a1523f720ae978c12b9c686d58baaa
parentc19f49a2ea4b17c52939f89011290f2314a68cc5
parent5df4eb4eb47d0f4510b86b1c92e319acb9d722a2
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