]> 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)
commiteecf1f898ac18ca53395d7523376b0f4cb60da62
tree1d387acf4fe9c5d3d210adfa0d66ca67b2ca5b2a
parent6e86dd8bd87896a8c54dc2f487110080bb64cb0a
parentd1332164554c63e36dceefc337051649c9cf2991
parentd0795601bde18e95f290ea9cb887c28d0fe33cca
parent133772f3d09bdd2795727474d08851ab6352802c
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