]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: e1bbc9c df9a808 26f4604 ffda088)
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)
commit393f008fdd6ec6bd7adeeae82d0af72aec769ada
tree60c79899a04f2e4e8d731b7ec788623310d88547tree | snapshot
parente1bbc9c1fc4252f80d3f9201d224ca6bb88ecd25commit | diff
parentdf9a80867c62c1a93f65b13a6776187cfe9770cbcommit | diff
parent26f460447f5d7702a5f2647a36bf43d9f08495fbcommit | diff
parentffda088652ae3400ebc8a7303d2e9eb2faccc163commit | 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.