commit 47ea8dd8710ba32391b729c95bea005b6fd86243
author Linus Torvalds <torvalds@linux-foundation.org> Fri Jul 11 17:10:05 2014 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> Fri Jul 11 17:10:05 2014 -0700
tree 387e2f5868d4d53156784e90291dfaa1931eaccd
parent bae78dc25993f62194ee53da67b14e3d5007c6c4
parent d093601be5e97d2729614419d0d256ed3b6a56b0

Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull x86 fixes from Peter Anvin:
 "A couple of further build fixes for the VDSO code.

  This is turning into a bit of a headache, and Andy has already come up
  with a more ultimate cleanup, but most likely that is 3.17 material"

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86-32, vdso: Fix vDSO build error due to missing align_vdso_addr()
  x86-64, vdso: Fix vDSO build breakage due to empty .rela.dyn