git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
c1ddbbc
16e0275
)
Linux-omap rebuilt: Merged in updated branches for v3.8
author
Tony Lindgren
<tony@atomide.com>
Fri, 9 Nov 2012 23:47:40 +0000
(15:47 -0800)
committer
Tony Lindgren
<tony@atomide.com>
Fri, 9 Nov 2012 23:47:40 +0000
(15:47 -0800)
$ git checkout -b tmp-rebuild-
1352504853
linus
$ git merge -m "Merge omap-for-v3.8/tmp-merge omap-for-v3.8/tmp-testing-misc omap-for-v3.8/tmp-testing-board" omap-for-v3.8/tmp-merge omap-for-v3.8/tmp-testing-misc omap-for-v3.8/tmp-testing-board
$ git merge -s ours master
$ git checkout master
$ git merge tmp-rebuild-
1352504853
To view the changes since the last rebuild, please do
$ git diff
16e0275a8a324fe35a87f9f1b1e9a03a690e3d1b
..
c1ddbbce6138823e1b56f6638b01ef0e5240c0db
arch/arm/*omap*/
Trivial merge