git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
37791b6
01218bf
)
Merge remote-tracking branch 'robh/for-next' into devicetree/next
author
Grant Likely
<grant.likely@linaro.org>
Sun, 29 Mar 2015 07:59:58 +0000
(08:59 +0100)
committer
Grant Likely
<grant.likely@linaro.org>
Sun, 29 Mar 2015 07:59:58 +0000
(08:59 +0100)
Conflicts:
drivers/of/unittest.c
Trivial merge