Merge branch 'linus' into x86/nmi
authorIngo Molnar <mingo@elte.hu>
Wed, 25 Jun 2008 10:31:28 +0000 (12:31 +0200)
committerIngo Molnar <mingo@elte.hu>
Wed, 25 Jun 2008 10:31:28 +0000 (12:31 +0200)
1  2 
arch/x86/kernel/Makefile

Simple merge