git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
9910b9c
cff6f04
)
Linux-omap rebuilt: omap-fixes and omap-testing updated
author
Tony Lindgren
<tony@atomide.com>
Fri, 12 Mar 2010 00:20:42 +0000
(16:20 -0800)
committer
Tony Lindgren
<tony@atomide.com>
Fri, 12 Mar 2010 00:20:42 +0000
(16:20 -0800)
$ git checkout -b tmp-rebuild-
1268353233
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-
1268353233
To view the changes since the last rebuild, please do
$ git diff
cff6f04ab8956edc332490b485d36934f84c05db
..
9910b9ce01f3676bd451fbc68da27db76091539b
arch/arm/*omap*/
Trivial merge