Merge branch 'x86/vdso'
commit3a47cf1450d5a353ce474df2bead6bca9c7437c0
authorIngo Molnar <mingo@elte.hu>
Tue, 7 Jun 2011 08:03:44 +0000 (7 10:03 +0200)
committerIngo Molnar <mingo@elte.hu>
Tue, 7 Jun 2011 08:03:44 +0000 (7 10:03 +0200)
tree23cf6eb3d92c27b5005713eaae806800bcdfaebb
parent7640405f6bd14ce2d62b8244e0b106fddcdedbb6
parent5cec93c216db77c45f7ce970d46283bcb1933884
Merge branch 'x86/vdso'
arch/x86/kernel/entry_64.S