]> err.no Git - linux-2.6/commitdiff
Merge branch 'linus' into x86/urgent
authorIngo Molnar <mingo@elte.hu>
Tue, 15 Jul 2008 11:45:59 +0000 (13:45 +0200)
committerIngo Molnar <mingo@elte.hu>
Tue, 15 Jul 2008 11:45:59 +0000 (13:45 +0200)
1  2 
arch/x86/kernel/acpi/sleep.c

Simple merge