]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branches 'pm-epoll', 'pnp' and 'powercap'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 6 Dec 2013 01:18:28 +0000 (02:18 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 6 Dec 2013 01:18:28 +0000 (02:18 +0100)
commita93ba2c950789fee3f7015676d58b70e7de35393
tree1d387acf4fe9c5d3d210adfa0d66ca67b2ca5b2a
parentd29bae1631a10974008867772eb938cf4c025648
parent21b55f1446da9e0bfeb0bd649c1b014d24a179ac
parentdd28a5d595bd7e2194b2163349d5682eddf22884
parent09f951c56e734e37fe17f343ea6087550ab1c370
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