Merge branch 'pm-sleep'

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