]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
projects / karo-tx-linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fb94cf0 42b946b 2d4054d)
Merge branches 'acpi-gpe' and 'acpi-video'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Sun, 5 Jan 2014 14:28:11 +0000 (15:28 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Sun, 5 Jan 2014 14:28:11 +0000 (15:28 +0100)
* acpi-gpe:
  ACPI / EC: disable GPE before removing GPE handler
  ACPI / Button: Fix enabling button GPEs twice

* acpi-video:
  ACPI: Blacklist Win8 OSI for some HP laptop 2013 models
  ACPI / video: Fix typo in video_detect.c

1  2  3 
drivers/acpi/blacklist.c patch | diff1 | diff2 | diff3 | blob | history
drivers/acpi/button.c patch | diff1 | diff2 | diff3 | blob | history
drivers/acpi/ec.c patch | diff1 | diff2 | diff3 | blob | history

diff --cc drivers/acpi/blacklist.c
Simple merge
diff --cc drivers/acpi/button.c
Simple merge
diff --cc drivers/acpi/ec.c
Simple merge
Linux kernel for KaRo TX COM modules