diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-01-11 20:53:46 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-01-11 20:53:46 +0100 |
| commit | 505569d208e61ab14f4b87957be0970ab33eb319 (patch) | |
| tree | 554efb1afbaa22e3119c5a7a6d1f66996c369e13 /arch/x86/kvm/i8254.c | |
| parent | Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/k... (diff) | |
| parent | Merge tag 'pr-20141223-x86-vdso' of git://git.kernel.org/pub/scm/linux/kernel... (diff) | |
| download | linux-505569d208e61ab14f4b87957be0970ab33eb319.tar.xz linux-505569d208e61ab14f4b87957be0970ab33eb319.zip | |
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 fixes from Ingo Molnar:
"Misc fixes: two vdso fixes, two kbuild fixes and a boot failure fix
with certain odd memory mappings"
* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86, vdso: Use asm volatile in __getcpu
x86/build: Clean auto-generated processor feature files
x86: Fix mkcapflags.sh bash-ism
x86: Fix step size adjustment during initial memory mapping
x86_64, vdso: Fix the vdso address randomization algorithm
Diffstat (limited to 'arch/x86/kvm/i8254.c')
0 files changed, 0 insertions, 0 deletions