git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
d750ac6
26bbb57
)
Linux-omap rebuilt: dss board changes merged
author
Tony Lindgren
<tony@atomide.com>
Fri, 12 Feb 2010 21:14:59 +0000
(13:14 -0800)
committer
Tony Lindgren
<tony@atomide.com>
Fri, 12 Feb 2010 21:14:59 +0000
(13:14 -0800)
$ git checkout -b tmp-rebuild-
1266009292
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-
1266009292
To view the changes since the last rebuild, please do
$ git diff
26bbb570cefa5db98caa22c77fd2be2f047a8d84
..
d750ac62331fc8935abe88d4920f98aec120128d
arch/arm/*omap*/
Trivial merge