]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
projects / karo-tx-linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0833289 f369fdf bdce57e)
Merge branches 'acpi-button' and 'acpi-tools'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 22 May 2017 18:29:06 +0000 (20:29 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 22 May 2017 18:29:06 +0000 (20:29 +0200)
* acpi-button:
  Revert "ACPI / button: Remove lid_init_state=method mode"

* acpi-tools:
  tools/power/acpi: Add .gitignore file

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

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