git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
2835c63
5792654
)
Linux omap got rebuilt from scratch
author
Tony Lindgren
<tony@atomide.com>
Tue, 13 Oct 2009 18:45:58 +0000
(11:45 -0700)
committer
Tony Lindgren
<tony@atomide.com>
Tue, 13 Oct 2009 18:45:58 +0000
(11:45 -0700)
$ git checkout -b tmp-rebuild-
1255459549
linus
$ git merge -m "Merge cbus" cbus
$ git merge -m "Merge ehci" ehci
$ 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 -s ours master
$ git checkout master
$ git merge tmp-rebuild-
1255459549
To view the changes since the last rebuild, please do
$ git diff
5792654e87e2416b66a452ebd5dd82064d1a16e3
..
2835c637585d6da7f3e5693acd573aa75c9b7226
arch/arm/*omap*/
Merge branch 'master' into tmp-rebuild-
1255459549
Trivial merge