summaryrefslogtreecommitdiffstats
path: root/include/net/xfrm.h
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-12-04 14:01:42 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-12-04 14:01:42 +0100
commitd441fe25e7de576e36a3cd96f22b737d2f15372a (patch)
treedbd34295d48d0d41c0060e2c25cdee524a63d82d /include/net/xfrm.h
parentMerge branches 'acpica', 'acpi-video' and 'device-properties' (diff)
parentPM / Domains: Fix bad of_node_put() in failure paths of genpd_dev_pm_attach() (diff)
parentcpufreq: use last policy after online for drivers with ->setpolicy (diff)
downloadlinux-d441fe25e7de576e36a3cd96f22b737d2f15372a.tar.xz
linux-d441fe25e7de576e36a3cd96f22b737d2f15372a.zip
Merge branches 'pm-domains' and 'pm-cpufreq'
* pm-domains: PM / Domains: Fix bad of_node_put() in failure paths of genpd_dev_pm_attach() PM / Domains: Validate cases of a non-bound driver in genpd governor * pm-cpufreq: cpufreq: use last policy after online for drivers with ->setpolicy