Merge branch 'x86-vdso-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 22 Apr 2014 16:09:06 +0000 (09:09 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 22 Apr 2014 16:09:06 +0000 (09:09 -0700)
commit39bfe90706ab0f588db7cb4d1c0e6d1181e1d2f9
treeecee81cf234dc8ccead58c761d88b28a1adcc7ca
parentc089b229dfdd09d59a11d8bc2344bf8196d575ce
parent378ed3ccd2a0404d031e771b65aa3af221ea8aea
Merge branch 'x86-vdso-for-linus' of git://git./linux/kernel/git/tip/tip

Pull x86 vdso fix from Peter Anvin:
 "This is a single build fix for building with gold as opposed to GNU
  ld.  It got queued up separately and was expected to be pushed during
  the merge window, but it got left behind"

* 'x86-vdso-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86, vdso: Make the vdso linker script compatible with Gold