Merge branch 'pm-sleep'

Browse source

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

...

This commit is contained in:

Rafael J. Wysocki 2015-06-22 14:40:28 +02:00

parent 1af858fdd2 ffa64eff95

commit 3bcda76d9d

1 changed files with 4 additions and 2 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

6

arch/x86/kernel/acpi/wakeup_32.S

View file