summaryrefslogtreecommitdiffstats
path: root/drivers
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 /drivers
parentACPICA: remove duplicate u8 typedef (diff)
parentACPI / SBS: Enable battery manager when present (diff)
parentcpuidle: Run tick_broadcast_exit() with disabled interrupts (diff)
downloadlinux-50904a7ddd1cab3e1d2ca007161e976f858d934f.tar.xz
linux-50904a7ddd1cab3e1d2ca007161e976f858d934f.zip
Merge branches 'acpica', 'acpi-battery' and 'pm-cpuidle'