]> git.ipfire.org Git - thirdparty/kernel/linux.git/commit
projects / thirdparty / kernel / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: e7c0648 33df4db)
Merge branch 'x86/urgent' into x86/xen
authorIngo Molnar <mingo@elte.hu>
Fri, 8 May 2009 08:50:00 +0000 (10:50 +0200)
committerIngo Molnar <mingo@elte.hu>
Fri, 8 May 2009 08:50:00 +0000 (10:50 +0200)
commitf066a155334642b8a206eec625b1925d88c48aeb
treecb12975e60b70d1dae3b7397bab955de78a4d01etree | snapshot
parente7c064889606aab3569669078c69b87b2c527e72commit | diff
parent33df4db04a79660150e1948e3296eeb451ac121bcommit | diff
Merge branch 'x86/urgent' into x86/xen

Conflicts:
arch/frv/include/asm/pgtable.h
arch/x86/include/asm/required-features.h
arch/x86/xen/mmu.c

Merge reason: x86/xen was on a .29 base still, move it to a fresher
              branch and pick up Xen fixes as well, plus resolve
              conflicts

Signed-off-by: Ingo Molnar <mingo@elte.hu>
arch/x86/include/asm/paravirt.h diff1 | diff2 | blob | history
arch/x86/lguest/boot.c diff1 | diff2 | blob | history
arch/x86/mm/pageattr.c diff1 | diff2 | blob | history
arch/x86/xen/mmu.c diff1 | diff2 | blob | history
kernel/sched.c diff1 | diff2 | blob | history
A mirror of Linus' kernel repository