git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
07961ac
72d48f9
)
Linux-omap rebuilt: Updated with pending branches
author
Tony Lindgren
<tony@atomide.com>
Wed, 3 Apr 2013 23:51:15 +0000
(16:51 -0700)
committer
Tony Lindgren
<tony@atomide.com>
Wed, 3 Apr 2013 23:51:15 +0000
(16:51 -0700)
$ git checkout -b tmp-rebuild-
1365033069
linus
$ git merge -m "Merge omap-for-v3.9/tmp-merge" omap-for-v3.9/tmp-merge
$ git merge -s ours master
$ git checkout master
$ git merge tmp-rebuild-
1365033069
To view the changes since the last rebuild, please do
$ git diff
72d48f9e03fddfdfa84da606c54530cde01f723f
..
07961ac7c0ee8b546658717034fe692fd12eefa9
arch/arm/*omap*/
Trivial merge