]> git.karo-electronics.de Git - karo-tx-linux.git/commit
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)
commita213bb509fa79a7077e45b94cf52f76d119e8570
tree269a875db429d2b9eac28409ec53e1e9f874db62
parentfb94cf038942ef1ea7a3b2044098e32b0ff21925
parent42b946bb35ef0057f13887dec5f081df0ba8840a
parent2d4054d8422462cb2771fdb4eb1925df55d2b320
Merge branches 'acpi-gpe' and 'acpi-video'

* 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
drivers/acpi/blacklist.c
drivers/acpi/button.c
drivers/acpi/ec.c