git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
9e6925c
9ebf92e
)
Linux-omap rebuilt: Updated to -rc4, merged in queued branches for merge window
author
Tony Lindgren
<tony@atomide.com>
Thu, 8 May 2014 21:33:00 +0000
(14:33 -0700)
committer
Tony Lindgren
<tony@atomide.com>
Thu, 8 May 2014 21:33:00 +0000
(14:33 -0700)
$ git checkout -b tmp-rebuild-
1399584774
linus
$ git merge -m "Merge omap-for-v3.16/tmp-merge" omap-for-v3.16/tmp-merge
$ git merge -s ours master
$ git checkout master
$ git merge tmp-rebuild-
1399584774
To view the changes since the last rebuild, please do
$ git diff
9ebf92e43869aac55790fe51a29360a6fb599364
..
9e6925cbdde0794270191372d9ab9e7c7227e879
arch/arm/*omap*/
Trivial merge