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)
commit639bb92a1ff1aab2c455acd183f973c022275798
tree51355fc8ce70f9cbb39f521d2aaa6f31da2944e0
parentcf8116c491e98b47a535348a50c94cc01770d9a3
parent24f2e0273f80ec262a772059e140a0adef35296d
Merge branch 'pm-sleep'

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