aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-04-30 21:05:57 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-04-30 21:05:57 +0200
commit50904a7ddd1cab3e1d2ca007161e976f858d934f (patch)
treef84fffb90b9ded69ffc66309eb5a7743b82b0f56 /include
parent9e9d55e69a95f8583283d9f01b04562d1278c95d (diff)
parent61f8ff693923e4b19748b0e8287b99778f2661c7 (diff)
parentdf8d9eeadd0f7a216f2476351d5aee43c6550bf0 (diff)
downloadlinux-stericsson-50904a7ddd1cab3e1d2ca007161e976f858d934f.tar.gz
Merge branches 'acpica', 'acpi-battery' and 'pm-cpuidle'