Merge branch 'linus' into x86/nmi
authorIngo Molnar <mingo@elte.hu>
Mon, 16 Jun 2008 08:17:15 +0000 (10:17 +0200)
committerIngo Molnar <mingo@elte.hu>
Mon, 16 Jun 2008 08:17:15 +0000 (10:17 +0200)
Conflicts:

arch/x86/kernel/nmi_32.c

1  2 
arch/x86/kernel/traps_32.c

Simple merge