git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
f953528
f856f16
)
Linux omap got rebuilt from scratch
author
Tony Lindgren
<tony@atomide.com>
Fri, 16 Oct 2009 01:18:25 +0000
(18:18 -0700)
committer
Tony Lindgren
<tony@atomide.com>
Fri, 16 Oct 2009 01:18:25 +0000
(18:18 -0700)
$ git checkout -b tmp-rebuild-
1255655897
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-
1255655897
To view the changes since the last rebuild, please do
$ git diff
f856f168bcbc5f49253dd12a4d8452857a785f1c
..
f9535282ad25a1f823bf2688df491d1dedc73939
arch/arm/*omap*/
Merge branch 'master' into tmp-rebuild-
1255655897
Trivial merge