Merge branch 'x86/s2ram-fix' into x86/urgent
commita1716d508abf77e4bd02c275ab9293b9866929f3
authorIngo Molnar <mingo@elte.hu>
Sat, 5 Jul 2008 06:42:45 +0000 (5 08:42 +0200)
committerIngo Molnar <mingo@elte.hu>
Sat, 5 Jul 2008 06:42:45 +0000 (5 08:42 +0200)
tree57195a0cfc8bdc353f163a8b3b53c8d99c2562e8
parent64e83b5a919a65eb35b63dd7e07c188379ff8ce6
parent4b4f7280d7fd1feeff134c2cf2db32fd583b6c29
Merge branch 'x86/s2ram-fix' into x86/urgent