Merge branches 'x86/paravirt', 'x86/pat', 'x86/setup-v2', 'x86/subarch', 'x86/uaccess...
authorIngo Molnar <mingo@elte.hu>
Fri, 13 Feb 2009 08:47:32 +0000 (09:47 +0100)
committerIngo Molnar <mingo@elte.hu>
Fri, 13 Feb 2009 08:47:32 +0000 (09:47 +0100)
commit7032e8696726354d6180d8a2d17191f958cd93ae
tree5af02052e633bcde0e33f77cac52ab4685ad07f1
parentf268fe7333ccd16e3e5b7de0be1df201e40a8e7c
parent3bd323a1da42525317e2ce6c93b97b5ba653bc9d
parentb13e24644c138d0ddbc451403c30a96b09bfd556
Merge branches 'x86/paravirt', 'x86/pat', 'x86/setup-v2', 'x86/subarch', 'x86/uaccess' and 'x86/urgent' into x86/core
arch/x86/include/asm/page.h
arch/x86/include/asm/paravirt.h
arch/x86/kernel/hpet.c
arch/x86/kernel/paravirt.c
arch/x86/kernel/ptrace.c
arch/x86/mm/ioremap.c
arch/x86/mm/pat.c
include/linux/mm.h
mm/mlock.c