| commit | 510ae0c994cb38fcf5033ad69eb8103552e335e8 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Sun Jan 31 16:50:31 2016 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Sun Jan 31 16:50:31 2016 -0800 |
| tree | 9414e8a68f91a1c61275c80bb95b390cd889689f | |
| parent | d517be5fcf1a7feb06ce3d5f28055ad1ce17030b [diff] | |
| parent | b0a119fd990420d84baf8bc802bd2caf85edb464 [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"