git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
35567d9
7f44909
)
Linux-omap rebuilt: Updated with pending branches for v3.16 merge window
author
Tony Lindgren
<tony@atomide.com>
Tue, 20 May 2014 00:38:58 +0000
(17:38 -0700)
committer
Tony Lindgren
<tony@atomide.com>
Tue, 20 May 2014 00:38:58 +0000
(17:38 -0700)
$ git checkout -b tmp-rebuild-
1400546331
linus
$ git merge -m "Merge omap-for-v3.16/tmp-merge-2014-05-19" omap-for-v3.16/tmp-merge-2014-05-19
$ git merge -s ours master
$ git checkout master
$ git merge tmp-rebuild-
1400546331
To view the changes since the last rebuild, please do
$ git diff
7f449094241c2fae88c78f0c6db528233ec1fca0
..
35567d93640cfb31f6dbaf5375c59fe91acb785f
arch/arm/*omap*/
Trivial merge