]> err.no Git - linux-2.6/commitdiff
Merge branch 'x86/s2ram-fix' into x86/urgent
authorIngo Molnar <mingo@elte.hu>
Sat, 5 Jul 2008 06:42:45 +0000 (08:42 +0200)
committerIngo Molnar <mingo@elte.hu>
Sat, 5 Jul 2008 06:42:45 +0000 (08:42 +0200)

Trivial merge