]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
Merge branch 'x86/core' into core/percpu
authorIngo Molnar <mingo@elte.hu>
Wed, 4 Mar 2009 01:29:19 +0000 (02:29 +0100)
committerIngo Molnar <mingo@elte.hu>
Wed, 4 Mar 2009 01:29:19 +0000 (02:29 +0100)
1  2 
arch/x86/Kconfig
arch/x86/mm/init_32.c
arch/x86/mm/init_64.c
arch/x86/xen/enlighten.c
mm/vmalloc.c

Simple merge
Simple merge
Simple merge
Simple merge
diff --cc mm/vmalloc.c
Simple merge