]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
Merge branch 'linus' into cpus4096
authorIngo Molnar <mingo@elte.hu>
Wed, 17 Dec 2008 12:07:48 +0000 (13:07 +0100)
committerIngo Molnar <mingo@elte.hu>
Wed, 17 Dec 2008 12:07:48 +0000 (13:07 +0100)
1  2 
arch/x86/kernel/setup.c
arch/x86/kernel/smpboot.c

Simple merge
Simple merge