| commit | f066a155334642b8a206eec625b1925d88c48aeb | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@elte.hu> | Fri May 08 10:50:00 2009 +0200 |
| committer | Ingo Molnar <mingo@elte.hu> | Fri May 08 10:50:00 2009 +0200 |
| tree | cb12975e60b70d1dae3b7397bab955de78a4d01e | |
| parent | e7c064889606aab3569669078c69b87b2c527e72 [diff] | |
| parent | 33df4db04a79660150e1948e3296eeb451ac121b [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>