]> git.baikalelectronics.ru Git - kernel.git/commitdiff
projects / kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ad5ca9b dcd9fa8)
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)
* pm-sleep:
  x86, kaslr: boot-time selectable with hibernation
  PM / hibernate: introduce "nohibernate" boot parameter


Trivial merge
Linux Kernel Source Tree.