]> err.no Git - linux-2.6/commitdiff
Merge branch 'linus' into x86/cleanups
authorIngo Molnar <mingo@elte.hu>
Fri, 18 Jul 2008 11:53:16 +0000 (13:53 +0200)
committerIngo Molnar <mingo@elte.hu>
Fri, 18 Jul 2008 11:53:16 +0000 (13:53 +0200)
1  2 
arch/x86/kernel/process.c
arch/x86/kernel/smpboot.c

Simple merge
Simple merge