git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
10a936a
f084767
)
Linux-omap rebuilt: Updated to -rc7, merged in late branches
author
Tony Lindgren
<tony@atomide.com>
Mon, 11 Feb 2013 18:55:46 +0000
(10:55 -0800)
committer
Tony Lindgren
<tony@atomide.com>
Mon, 11 Feb 2013 18:55:46 +0000
(10:55 -0800)
$ git checkout -b tmp-rebuild-
1360608941
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-
1360608941
To view the changes since the last rebuild, please do
$ git diff
f0847670dadb739cb75a8682a41aca9d06c751dd
..
10a936a2a79c467e39dd3a570074ebc279f873f4
arch/arm/*omap*/
Trivial merge