projects
/
platform
/
kernel
/
linux-rpi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
d517be5
b0a119f
)
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
author
Linus Torvalds
<torvalds@linux-foundation.org>
Mon, 1 Feb 2016 00:50:31 +0000
(16:50 -0800)
committer
Linus Torvalds
<torvalds@linux-foundation.org>
Mon, 1 Feb 2016 00:50:31 +0000
(16:50 -0800)
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"
Trivial merge