| commit | b233969eaa98c7b339d955fe25a58bf6bf25739a | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@elte.hu> | Fri Feb 13 13:09:00 2009 +0100 |
| committer | Ingo Molnar <mingo@elte.hu> | Fri Feb 13 13:09:00 2009 +0100 |
| tree | 96c372824bfe05cae4b2b2b57c96719d633296da | |
| parent | d040c1614c24162adc3fe106b182596999264e26 [diff] | |
| parent | 54321d947ae9d6a051b81e3eccaf2d8658aeecc6 [diff] |
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