]> git.baikalelectronics.ru Git - kernel.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)
commitf0cceaca30d17c8da625fd6255c4d3db762e4f07
tree96c372824bfe05cae4b2b2b57c96719d633296da
parent18eee1edca1073c131bcfd3b26b86192baf952d5
parent04c0de860efef46faa90086c94c3ca8071fd40e4
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