git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
91e5545
27f7306
)
Linux omap got rebuilt from scratch: Plat headers series merged
author
Tony Lindgren
<tony@atomide.com>
Mon, 19 Oct 2009 23:05:54 +0000
(16:05 -0700)
committer
Tony Lindgren
<tony@atomide.com>
Mon, 19 Oct 2009 23:05:54 +0000
(16:05 -0700)
$ git checkout -b tmp-rebuild-
1255993547
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 -m "Merge ehci" ehci
$ git merge -s ours master
$ git checkout master
$ git merge tmp-rebuild-
1255993547
To view the changes since the last rebuild, please do
$ git diff
27f73066b96b4a96b647803876240ca87770d12c
..
91e55455b71e94f9e5b1e53a4ce10dcacb4469d3
arch/arm/*omap*/
Merge branch 'master' into tmp-rebuild-
1255993547
Trivial merge