From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Mon, 22 Jun 2015 12:40:28 +0000 (+0200)
Subject: Merge branch 'pm-sleep'
X-Git-Tag: omap-for-v4.2/fixes-rc1^2~154^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3bcda76d9d1c0c4e70d5e3b7a962e46de2e79b61;p=pandora-kernel.git

Merge branch 'pm-sleep'

* pm-sleep:
  x86: Load __USER_DS into DS/ES after resume
---

3bcda76d9d1c0c4e70d5e3b7a962e46de2e79b61
Reading git-diff-tree failed