]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 6b39ff8 d7199cb)
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)
commitb828bde29ffb3583b792056ba2908586cd2223a6
tree9414e8a68f91a1c61275c80bb95b390cd889689ftree | snapshot
parent6b39ff8e5030f4ce7b6972c58740c755621420ddcommit | diff
parentd7199cbb8ef1f7c341063735f7e60fbf47fddc52commit | diff
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"
Linux Kernel Source Tree.