git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
e28f23d
c65b99f
)
Merge tag 'v4.1-rc6' into next/dt
author
Kevin Hilman
<khilman@linaro.org>
Thu, 11 Jun 2015 21:37:45 +0000
(14:37 -0700)
committer
Kevin Hilman
<khilman@linaro.org>
Thu, 11 Jun 2015 21:37:45 +0000
(14:37 -0700)
Linux 4.1-rc6
Conflicts:
arch/arm/boot/dts/zynq-7000.dtsi
Resolution summary:
Mainline had an earlier version of the commit, resolve in favor of the
newer patch in next/dt branch.
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff