Merge branch 'x86/vdso'
commite8acbcf5f40fcf8c870de49acf958159c9ab802f
authorIngo Molnar <mingo@elte.hu>
Fri, 5 Aug 2011 10:21:13 +0000 (5 12:21 +0200)
committerIngo Molnar <mingo@elte.hu>
Fri, 5 Aug 2011 10:21:13 +0000 (5 12:21 +0200)
tree2f51c193b976f181c5d5b95464db18446d755189
parent9736f94afb9f3544f711cb81f2e4e37e1aff85c3
parentc149a665ac488e0dac22a42287f45ad1bda06ff1
Merge branch 'x86/vdso'
arch/x86/include/asm/paravirt_types.h
arch/x86/kernel/paravirt.c
arch/x86/mm/fault.c
arch/x86/xen/enlighten.c
arch/x86/xen/mmu.c