git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
fc2db8b
c4bc411
)
Linux-omap rebuilt: updated to 2.6.34-rc1
author
Tony Lindgren
<tony@atomide.com>
Wed, 10 Mar 2010 00:54:14 +0000
(16:54 -0800)
committer
Tony Lindgren
<tony@atomide.com>
Wed, 10 Mar 2010 00:54:14 +0000
(16:54 -0800)
$ git checkout -b tmp-rebuild-
1268182444
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-
1268182444
To view the changes since the last rebuild, please do
$ git diff
c4bc4118977433c4e095f3dcb5d679aa745ff967
..
fc2db8b3a2c545b302204350a567589b50060fbb
arch/arm/*omap*/
Trivial merge