summaryrefslogtreecommitdiff
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
parent7cdcec991c06cd6d792b304851cc245cfec507a7 (diff)
parent95f19f658ce177387345b51bd48fed7b9cd7d4e8 (diff)
parent8a37ea50e7acf8db6821ba094ca41384e7d8c70c (diff)
parent95677a9a3847de4f37e0f463aeb94aa8d5cccc50 (diff)
downloadlinux-sh-8e7030097e9f3ea8031e8cc4230e357cb556f8f9.tar.gz
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