summaryrefslogtreecommitdiffstats
path: root/net/ipv4/tcp_fastopen.c
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-12-06 02:18:28 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-12-06 02:18:28 +0100
commit8e7030097e9f3ea8031e8cc4230e357cb556f8f9 (patch)
tree1d387acf4fe9c5d3d210adfa0d66ca67b2ca5b2a /net/ipv4/tcp_fastopen.c
parentMerge branches 'pm-cpuidle' and 'pm-cpufreq' (diff)
parentepoll: drop EPOLLWAKEUP if PM_SLEEP is disabled (diff)
parentPNP: fix restoring devices after hibernation (diff)
parentPowerCap: Fix mode for energy counter (diff)
downloadlinux-8e7030097e9f3ea8031e8cc4230e357cb556f8f9.tar.xz
linux-8e7030097e9f3ea8031e8cc4230e357cb556f8f9.zip
Merge branches 'pm-epoll', 'pnp' and 'powercap'
* pm-epoll: epoll: drop EPOLLWAKEUP if PM_SLEEP is disabled * pnp: PNP: fix restoring devices after hibernation * powercap: PowerCap: Fix mode for energy counter