tree 1d387acf4fe9c5d3d210adfa0d66ca67b2ca5b2a
parent 7cdcec991c06cd6d792b304851cc245cfec507a7
parent 95f19f658ce177387345b51bd48fed7b9cd7d4e8
parent 8a37ea50e7acf8db6821ba094ca41384e7d8c70c
parent 95677a9a3847de4f37e0f463aeb94aa8d5cccc50
author Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1386292708 +0100
committer Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1386292708 +0100

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