projects
/
linux-2.6-microblaze.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
cf8116c
24f2e02
)
Merge branch 'pm-sleep'
author
Rafael J. Wysocki
<rafael.j.wysocki@intel.com>
Thu, 19 Jun 2014 12:41:11 +0000
(14:41 +0200)
committer
Rafael J. Wysocki
<rafael.j.wysocki@intel.com>
Thu, 19 Jun 2014 12:41:11 +0000
(14:41 +0200)
* pm-sleep:
x86, kaslr: boot-time selectable with hibernation
PM / hibernate: introduce "nohibernate" boot parameter
Trivial merge