]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'pm-sleep'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 19 Jun 2014 12:41:11 +0000 (14:41 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 19 Jun 2014 12:41:11 +0000 (14:41 +0200)
commit8d91f07bed92560225c5d9804e53d3da5ba55ee1
tree51355fc8ce70f9cbb39f521d2aaa6f31da2944e0
parentad5ca9b55d9be139a2443a2803a252a8287961bd
parentdcd9fa8629651df37863eb9773cdad2dd2621701
Merge branch 'pm-sleep'

* pm-sleep:
  x86, kaslr: boot-time selectable with hibernation
  PM / hibernate: introduce "nohibernate" boot parameter