git.oblomov.eu Git - linux-2.6/commit

author	Ingo Molnar <mingo@elte.hu>
	Fri, 13 Feb 2009 12:09:00 +0000 (13:09 +0100)
committer	Ingo Molnar <mingo@elte.hu>
	Fri, 13 Feb 2009 12:09:00 +0000 (13:09 +0100)
commit	b233969eaa98c7b339d955fe25a58bf6bf25739a
tree	96c372824bfe05cae4b2b2b57c96719d633296da	tree \| snapshot
parent	d040c1614c24162adc3fe106b182596999264e26	commit \| diff
parent	54321d947ae9d6a051b81e3eccaf2d8658aeecc6	commit \| diff

Merge branch 'x86/untangle2' of git://git./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

Making Linux better for my computers

RSS Atom

arch/x86/include/asm/page_types.h	\|	diff2 \|	blob \| history
arch/x86/include/asm/paravirt.h	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/pgtable.h	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/processor.h	diff1 \|	diff2 \|	blob \| history
arch/x86/mm/fault.c	diff1 \|	diff2 \|	blob \| history