tree 310a4aaef96e9ead280652f6ba8e3c7226c33c7b
parent 4e5e384c46fc4fa812f9313e7d5abc1d0d0511a7
parent 398c7500a1f5f74e207bd2edca1b1721b3cc1f1e
author Linus Torvalds <torvalds@linux-foundation.org> 1451850571 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1451850571 -0800

Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

Pull MIPS build fix from Ralf Baechle:
 "Fix a makefile issue resulting in build breakage with older binutils.

  This has sat in -next for a few days, testers and buildbot are happy
  with it, too though if you are going for another -rc that'd certainly
  help ironing out a few more issues"

* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
  MIPS: VDSO: Fix build error with binutils 2.24 and earlier