tree 57195a0cfc8bdc353f163a8b3b53c8d99c2562e8
parent 64e83b5a919a65eb35b63dd7e07c188379ff8ce6
parent 4b4f7280d7fd1feeff134c2cf2db32fd583b6c29
author Ingo Molnar <mingo@elte.hu> 1215240165 +0200
committer Ingo Molnar <mingo@elte.hu> 1215240165 +0200

Merge branch 'x86/s2ram-fix' into x86/urgent