]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
projects / linux-2.6-omap-h63xx.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a852cbf 55d8085)
Merge branch 'x86/urgent' into x86/core
authorIngo Molnar <mingo@elte.hu>
Thu, 26 Feb 2009 05:30:42 +0000 (06:30 +0100)
committerIngo Molnar <mingo@elte.hu>
Thu, 26 Feb 2009 05:30:42 +0000 (06:30 +0100)
Conflicts:
arch/x86/mach-voyager/voyager_smp.c

1  2 
arch/x86/xen/enlighten.c patch | diff1 | diff2 | blob | history

diff --cc arch/x86/xen/enlighten.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.