diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-12-06 02:18:28 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-12-06 02:18:28 +0100 |
| commit | 8e7030097e9f3ea8031e8cc4230e357cb556f8f9 (patch) | |
| tree | 1d387acf4fe9c5d3d210adfa0d66ca67b2ca5b2a /include | |
| parent | 7cdcec991c06cd6d792b304851cc245cfec507a7 (diff) | |
| parent | 95f19f658ce177387345b51bd48fed7b9cd7d4e8 (diff) | |
| parent | 8a37ea50e7acf8db6821ba094ca41384e7d8c70c (diff) | |
| parent | 95677a9a3847de4f37e0f463aeb94aa8d5cccc50 (diff) | |
| download | linux-8e7030097e9f3ea8031e8cc4230e357cb556f8f9.tar.bz2 | |
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