Merge branch 'pm-sleep'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 22 Jun 2015 12:40:28 +0000 (14:40 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 22 Jun 2015 12:40:28 +0000 (14:40 +0200)
commit3bcda76d9d1c0c4e70d5e3b7a962e46de2e79b61
tree2fa24cb3d42a643258185b5cade0787dc84f59e0
parent1af858fdd2aa4107ff4e1c9fc1b23929d16a7491
parentffa64eff956a25548cad0391dbc14c672827be7b
Merge branch 'pm-sleep'

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