From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 12 Jul 2014 00:10:05 +0000 (-0700)
Subject: Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v3.16-rc5~17
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=47ea8dd8710ba32391b729c95bea005b6fd86243;p=~emulex%2Finfiniband.git

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
---

47ea8dd8710ba32391b729c95bea005b6fd86243