]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 1 Feb 2016 00:50:31 +0000 (16:50 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 1 Feb 2016 00:50:31 +0000 (16:50 -0800)
commita318bd751ae6b89b4bce77545969e981f6e9e296
tree9414e8a68f91a1c61275c80bb95b390cd889689f
parenta1ea319a13bbf27ef330f84451eca39e8575ec86
parent008088ac12f7e5612a4aa3784370413a7160641d
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"