git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
eeaf09a
1792702
)
Linux-omap rebuilt: Rebuilt with updated patches for v3.18
author
Tony Lindgren
<tony@atomide.com>
Thu, 11 Sep 2014 22:02:19 +0000
(15:02 -0700)
committer
Tony Lindgren
<tony@atomide.com>
Thu, 11 Sep 2014 22:02:19 +0000
(15:02 -0700)
$ git checkout -b tmp-rebuild-
1410472934
linus
$ git merge -m "Merge omap-for-v3.18/tmp-merge" omap-for-v3.18/tmp-merge
$ git merge -s ours master
$ git checkout master
$ git merge tmp-rebuild-
1410472934
To view the changes since the last rebuild, please do
$ git diff
1792702ac3568379e30e5d97ee4a3742628daffc
..
eeaf09ae2bdd67b64dd075690711dcba2dcf5604
arch/arm/*omap*/
Trivial merge