git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
61fadd4
f7540c9
)
Linux-omap rebuilt: Updated to -rc6 and merged in pending patches
author
Tony Lindgren
<tony@atomide.com>
Sat, 2 Feb 2013 00:19:16 +0000
(16:19 -0800)
committer
Tony Lindgren
<tony@atomide.com>
Sat, 2 Feb 2013 00:19:16 +0000
(16:19 -0800)
$ git checkout -b tmp-rebuild-
1359764351
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-
1359764351
To view the changes since the last rebuild, please do
$ git diff
f7540c9ef64dedc521d33f707ecc3c3828ca8f00
..
61fadd48d7a022800382628094a7eddb462e91b1
arch/arm/*omap*/
Trivial merge