From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 1 Feb 2016 00:50:31 +0000 (-0800)
Subject: Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
X-Git-Tag: v4.5-rc2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=510ae0c994cb38fcf5033ad69eb8103552e335e8;p=thirdparty%2Fkernel%2Fstable.git

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

Pull MIPS fix from Ralf Baechle:
 "Just a single revert for a patch which I had upstreamed out of
  sequence"

* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
  Revert "MIPS: bcm63xx: nvram: Remove unused bcm63xx_nvram_get_psi_size() function"
---

510ae0c994cb38fcf5033ad69eb8103552e335e8