]> git.karo-electronics.de Git - linux-beck.git/commit
projects / linux-beck.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 867f9d4 e63f6e2 c128c77 232de51)
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)
commit4488c99b6397ab7db14c9ffeb8e94f3fca5dbb19
tree60c79899a04f2e4e8d731b7ec788623310d88547tree | snapshot
parent867f9d463b82462793ea4610e748be0b04b37fc7commit | diff
parente63f6e28dda6de3de2392ddca321e211fd860925commit | diff
parentc128c776e0f45d3edaf44ab3fecfa5d1f7067c07commit | diff
parent232de514379082e7ec431c66c9713a6ef23d5dcbcommit | 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
Beck SC1x5 Kernel