From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 12 Jan 2016 18:26:03 +0000 (-0800)
Subject: Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
X-Git-Tag: v4.5-rc1~147
X-Git-Url: https://git.kernelconcepts.de/?a=commitdiff_plain;h=c5c80bd923d34f7dc70e7b23eb427cd284989a1b;p=karo-tx-linux.git

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

Pull MIPS fixes from Ralf Baechle:
 "This is the final pull request for MIPS for 4.4.  It fixes:

   - scripts/ld-version.sh parsing of ld version numbers that contain
     large numbers as components.
   - fix parsing of version numbers as used by Fedora's ld.

  Currently scripts/ld-version.sh is only being used by MIPS"

[ This obviously missed 4.4, so getting merged now in the merge window
  for 4.5 instead ]

* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
  ld-version: Fix it on Fedora
  Fix ld-version.sh to handle large 3rd version part
---

c5c80bd923d34f7dc70e7b23eb427cd284989a1b