]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 34bc5cf f91c1d8 a83a505 4dfe671)
Merge branches 'acpi-resources', 'acpi-ac', 'acpi-scan' and 'acpi-battery'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 10 Jul 2014 19:03:25 +0000 (21:03 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 10 Jul 2014 19:03:25 +0000 (21:03 +0200)
commitc8ac3201c88337e24efae9e0f04d0838d92e9ed3
tree60c79899a04f2e4e8d731b7ec788623310d88547tree | snapshot
parent34bc5cff47f823c519105951556c6b25d9d4f308commit | diff
parentf91c1d8875a3acda8a4170cf387cc11d5cc153bccommit | diff
parenta83a505e5c3c98cb1d0ee12b6a875b6f67f756c4commit | diff
parent4dfe67111310a5d361ec031cb2f2ba8c2a09794ccommit | diff
Merge branches 'acpi-resources', 'acpi-ac', 'acpi-scan' and 'acpi-battery'

* acpi-resources:
  ACPI / resources: only reject zero length resources based at address zero

* acpi-ac:
  Revert "ACPI / AC: Remove AC's proc directory."

* acpi-scan:
  ACPI / PNP: add soc_button_array device ID to PNP IDs list

* acpi-battery:
  ACPI / battery: fix wrong value of capacity_now reported when fully charged
  ACPI / battery: Retry to get battery information if failed during probing
Linux Kernel Source Tree.