diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-04-30 21:05:57 +0200 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-04-30 21:05:57 +0200 |
commit | 50904a7ddd1cab3e1d2ca007161e976f858d934f (patch) | |
tree | f84fffb90b9ded69ffc66309eb5a7743b82b0f56 /drivers | |
parent | ACPICA: remove duplicate u8 typedef (diff) | |
parent | ACPI / SBS: Enable battery manager when present (diff) | |
parent | cpuidle: Run tick_broadcast_exit() with disabled interrupts (diff) | |
download | linux-50904a7ddd1cab3e1d2ca007161e976f858d934f.tar.xz linux-50904a7ddd1cab3e1d2ca007161e976f858d934f.zip |
Merge branches 'acpica', 'acpi-battery' and 'pm-cpuidle'