]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branches 'acpi-video' and 'acpi-proc'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 6 May 2014 22:08:47 +0000 (00:08 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 6 May 2014 22:08:47 +0000 (00:08 +0200)
commit0551f1be34670cc7d33b6d3eec6ec71fce08c2f0
treef436456ac59268538ac0bfb99dadabc26f79c895
parentf146624dcae6cfc08d4cd73d9d669b53fb060fec
parent43d9490244254d2d6adb0f3c6275c7b8d032a2dd
parent3a670cc79342c36d308decd5f90351830ed1685c
Merge branches 'acpi-video' and 'acpi-proc'

* acpi-video:
  ACPI / video: Add use_native_backlight quirks for more systems

* acpi-proc:
  ACPI: Revert "ACPI / Battery: Remove battery's proc directory"
  ACPI: Revert "ACPI: Remove CONFIG_ACPI_PROCFS_POWER and cm_sbsc.c"