tree 554efb1afbaa22e3119c5a7a6d1f66996c369e13
parent 5ab551d662396f8437ec5aba12210b7a67eb492b
parent 2aba73a6146bb85d4a42386ca41dec0f4aa4b3ad
author Linus Torvalds <torvalds@linux-foundation.org> 1421006026 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1421006026 -0800

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