git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
56fa9b8
b62ab04
)
Linux-omap rebuilt: Processor support for new omaps merged
author
Tony Lindgren
<tony@atomide.com>
Wed, 11 Nov 2009 02:31:00 +0000
(18:31 -0800)
committer
Tony Lindgren
<tony@atomide.com>
Wed, 11 Nov 2009 02:31:00 +0000
(18:31 -0800)
$ git checkout -b tmp-rebuild-
1257906651
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-
1257906651
To view the changes since the last rebuild, please do
$ git diff
b62ab044fa4e967d0b8a591b43e225930e612cc4
..
56fa9b8c428134787ab3524aa85d15273de668aa
arch/arm/*omap*/
Merge branch 'master' into tmp-rebuild-
1257906651
Trivial merge