OSDN Git Service
(root)
/
tomoyo
/
tomoyo-test1.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
7cdcec9
95f19f6
8a37ea5
95677a9
)
Merge branches 'pm-epoll', 'pnp' and 'powercap'
author
Rafael J. Wysocki
<rafael.j.wysocki@intel.com>
Fri, 6 Dec 2013 01:18:28 +0000
(
02:18
+0100)
committer
Rafael J. Wysocki
<rafael.j.wysocki@intel.com>
Fri, 6 Dec 2013 01:18:28 +0000
(
02:18
+0100)
* pm-epoll:
epoll: drop EPOLLWAKEUP if PM_SLEEP is disabled
* pnp:
PNP: fix restoring devices after hibernation
* powercap:
PowerCap: Fix mode for energy counter
Trivial merge