From: Ingo Molnar Date: Sat, 5 Jul 2008 06:42:45 +0000 (+0200) Subject: Merge branch 'x86/s2ram-fix' into x86/urgent X-Git-Tag: v2.6.26-rc9~4^2 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a1716d508abf77e4bd02c275ab9293b9866929f3;p=linux-2.6 Merge branch 'x86/s2ram-fix' into x86/urgent --- a1716d508abf77e4bd02c275ab9293b9866929f3