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-Url: https://git.stricted.de/?a=commitdiff_plain;h=3bcda76d9d1c0c4e70d5e3b7a962e46de2e79b61;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

Merge branch 'pm-sleep'

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

3bcda76d9d1c0c4e70d5e3b7a962e46de2e79b61