]> 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)
commitbc644b755efcedcfb35bb592a8530b579557b319
tree51355fc8ce70f9cbb39f521d2aaa6f31da2944e0
parent6ab036dc47777156b6b31c17825ae6b7d64875d8
parentdc5fb79755c47d699d8288c67ceba8e7921d20c7
Merge branch 'pm-sleep'

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