git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
9a710db
3f7bd0e
)
Linux-omap rebuilt: omap for-next merged to mainline
author
Tony Lindgren
<tony@atomide.com>
Tue, 2 Mar 2010 22:15:09 +0000
(14:15 -0800)
committer
Tony Lindgren
<tony@atomide.com>
Tue, 2 Mar 2010 22:15:09 +0000
(14:15 -0800)
$ git checkout -b tmp-rebuild-
1267568099
linus
$ git merge -m "Merge omap-testing" omap-testing
$ git merge -m "Merge for-next" for-next
$ git merge -m "Merge cbus" cbus
$ git merge -s ours master
$ git checkout master
$ git merge tmp-rebuild-
1267568099
To view the changes since the last rebuild, please do
$ git diff
3f7bd0e4830753dc567b60711f0d88117813fb5c
..
9a710db4cdf263e579938b51250fa00eeccd66d8
arch/arm/*omap*/
Trivial merge