diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-03-13 22:12:30 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-03-13 22:12:30 +0100 |
| commit | d5af40d6b34d9d1ba39a27f657948cbce4e0b0e7 (patch) | |
| tree | ebcf28b0d3cc92a8c23d1c2c415e58f8b1cc31a3 /net/ipv6/ip6_vti.c | |
| parent | 89935315f192abf7068d0044cefc84f162c3c81f (diff) | |
| parent | c4e1acbb35e4a3838cdfc0e7f8237e844aff00b6 (diff) | |
| parent | a4e90bed511220ff601d064c9e5d583e91308f65 (diff) | |
| parent | 2ed99e39cb9392312c100d9da591c20641c64d12 (diff) | |
Merge branches 'pnp', 'acpi-init', 'acpi-sleep' and 'pm-cpufreq'
* pnp:
PNP / ACPI: proper handling of ACPI IO/Memory resource parsing failures
* acpi-init:
ACPI / init: Invoke early ACPI initialization later
* acpi-sleep:
ACPI / sleep: Add extra checks for HW Reduced ACPI mode sleep states
* pm-cpufreq:
cpufreq: Skip current frequency initialization for ->setpolicy drivers