git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
4589112
dc73899
)
Linux-omap rebuilt: omap-fixes updated
author
Tony Lindgren
<tony@atomide.com>
Thu, 11 Mar 2010 03:23:51 +0000
(19:23 -0800)
committer
Tony Lindgren
<tony@atomide.com>
Thu, 11 Mar 2010 03:23:51 +0000
(19:23 -0800)
$ git checkout -b tmp-rebuild-
1268277822
linus
$ git merge -m "Merge omap-fixes" omap-fixes
$ 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-
1268277822
To view the changes since the last rebuild, please do
$ git diff
dc73899a58be5e834b8df3a9049cdb1115acf175
..
4589112c2c29961dffab624f16a41f9625751c60
arch/arm/*omap*/
Trivial merge