git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
fe367bf
cc2b5d5
)
Linux-omap rebuilt: Updated to -rc4, merged in updated development branches
author
Tony Lindgren
<tony@atomide.com>
Wed, 7 Nov 2012 02:03:23 +0000
(18:03 -0800)
committer
Tony Lindgren
<tony@atomide.com>
Wed, 7 Nov 2012 02:03:23 +0000
(18:03 -0800)
$ git checkout -b tmp-rebuild-
1352253795
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-
1352253795
To view the changes since the last rebuild, please do
$ git diff
cc2b5d50ec3fb72698cb8699b127e2f512f4b42d
..
fe367bfd1149eb545d6a463f930b697517d2e53f
arch/arm/*omap*/
Trivial merge