]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'x86/vdso'
authorIngo Molnar <mingo@kernel.org>
Thu, 22 May 2014 11:56:14 +0000 (13:56 +0200)
committerIngo Molnar <mingo@kernel.org>
Thu, 22 May 2014 11:56:14 +0000 (13:56 +0200)
commit4873023fa5a04e8716acdd04d68fcd9996248272
tree36d744aef62b7df045d480b67a625053c7a536f7
parent423175ba1954f067414a4b5e82d58045710f936f
parent94aca80897501f994c795cffc458ecd0404377c7
Merge branch 'x86/vdso'

Conflicts:
arch/x86/kernel/entry_64.S
arch/x86/Kconfig
arch/x86/kernel/cpu/common.c
arch/x86/kernel/entry_32.S
arch/x86/kernel/entry_64.S
arch/x86/kernel/hpet.c
arch/x86/mm/fault.c