projects
/
platform
/
kernel
/
linux-starfive.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
a750b12
145367b
)
Merge branch 'fix/bcm2835-code' of git://git.kernel.org/pub/scm/linux/kernel/git...
author
Mark Brown
<broonie@kernel.org>
Mon, 27 Apr 2015 18:47:37 +0000
(19:47 +0100)
committer
Mark Brown
<broonie@kernel.org>
Mon, 27 Apr 2015 18:47:37 +0000
(19:47 +0100)
Conflicts:
drivers/spi/spi-bcm2835.c
Trivial merge