summaryrefslogtreecommitdiffstats
path: root/net/ipv6/ip6_tunnel.c
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-12-08 19:52:16 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-12-08 19:52:16 +0100
commit69bad361e69ac0e9f96865f405439e7cbd8c0136 (patch)
treef8133d3e8e426a2f730d85a41c287f1b7965e622 /net/ipv6/ip6_tunnel.c
parentMerge branch 'acpica' (diff)
parentACPI: Add _DEP support to fix battery issue on Asus T100TA (diff)
parentACPI / sleep: Drain outstanding events after disabling multiple GPEs (diff)
parentdmaengine: dw: enable runtime PM (diff)
parentACPI / cpuidle: avoid assigning signed errno to acpi_status (diff)
downloadlinux-69bad361e69ac0e9f96865f405439e7cbd8c0136.tar.xz
linux-69bad361e69ac0e9f96865f405439e7cbd8c0136.zip
Merge branches 'acpi-scan', 'acpi-pm', 'acpi-lpss' and 'acpi-processor'
* acpi-scan: ACPI: Add _DEP support to fix battery issue on Asus T100TA * acpi-pm: ACPI / sleep: Drain outstanding events after disabling multiple GPEs ACPI / PM: Fixed a typo in a comment * acpi-lpss: dmaengine: dw: enable runtime PM ACPI / LPSS: introduce a 'proxy' device to power on LPSS for DMA ACPI / LPSS: allow to use specific PM domain during ->probe() ACPI / LPSS: add all LPSS devices to the specific power domain * acpi-processor: ACPI / cpuidle: avoid assigning signed errno to acpi_status ACPI / processor: remove unused variabled from acpi_processor_power structure ACPI / processor: Update the comments in processor.h