]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-client.git/commitdiff
Merge branch 'acpi-ec' into acpi-pm
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 20 Jul 2017 14:44:09 +0000 (16:44 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 20 Jul 2017 14:44:09 +0000 (16:44 +0200)
1  2 
drivers/acpi/ec.c

Simple merge