]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
Merge branch 'x86/untangle2' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy...
authorIngo Molnar <mingo@elte.hu>
Fri, 13 Feb 2009 12:09:00 +0000 (13:09 +0100)
committerIngo Molnar <mingo@elte.hu>
Fri, 13 Feb 2009 12:09:00 +0000 (13:09 +0100)
commitb233969eaa98c7b339d955fe25a58bf6bf25739a
tree96c372824bfe05cae4b2b2b57c96719d633296da
parentd040c1614c24162adc3fe106b182596999264e26
parent54321d947ae9d6a051b81e3eccaf2d8658aeecc6
Merge branch 'x86/untangle2' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen into x86/headers

Conflicts:
arch/x86/include/asm/page.h
arch/x86/include/asm/pgtable.h
arch/x86/mach-voyager/voyager_smp.c
arch/x86/mm/fault.c
arch/x86/include/asm/page_types.h
arch/x86/include/asm/paravirt.h
arch/x86/include/asm/pgtable.h
arch/x86/include/asm/processor.h
arch/x86/mm/fault.c