projects
/
platform
/
kernel
/
linux-rpi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
e841888
2ea659a
)
Merge tag 'v4.12-rc1' into fixes
author
Olof Johansson
<olof@lixom.net>
Fri, 19 May 2017 06:54:47 +0000
(23:54 -0700)
committer
Olof Johansson
<olof@lixom.net>
Fri, 19 May 2017 06:54:47 +0000
(23:54 -0700)
We've received a few fixes branches with -rc1 as base, but our contents was
still at pre-rc1. Merge it in expliticly to make 'git merge --log' clear on
hat was actually merged.
Signed-off-by: Olof Johansson <olof@lixom.net>
Trivial merge