projects / linux-2.6-microblaze.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: d517be5 b0a119f)
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)
commit510ae0c994cb38fcf5033ad69eb8103552e335e8
tree9414e8a68f91a1c61275c80bb95b390cd889689ftree
parentd517be5fcf1a7feb06ce3d5f28055ad1ce17030bcommit | diff
parentb0a119fd990420d84baf8bc802bd2caf85edb464commit | diff
Merge branch 'upstream' of git://git.linux-mips.org/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"
MicroBlaze GIT Repository