From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Thu, 19 Jun 2014 12:41:11 +0000 (+0200)
Subject: Merge branch 'pm-sleep'
X-Git-Tag: v3.16-rc2~14^2~1
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=639bb92a1ff1aab2c455acd183f973c022275798;p=linux-2.6-block.git

Merge branch 'pm-sleep'

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

639bb92a1ff1aab2c455acd183f973c022275798