git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
4cd5450
edc65fc
)
Linux-omap rebuilt: Updated to -rc5
author
Tony Lindgren
<tony@atomide.com>
Wed, 22 Sep 2010 17:32:49 +0000
(10:32 -0700)
committer
Tony Lindgren
<tony@atomide.com>
Wed, 22 Sep 2010 17:32:49 +0000
(10:32 -0700)
$ git checkout -b tmp-rebuild-
1285176722
linus
$ git merge -m "Merge cbus" cbus
$ 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-
1285176722
To view the changes since the last rebuild, please do
$ git diff
edc65fc2a2a704595fc7e63d6d01108a30aaddf5
..
4cd5450b171309b71649d5896ae1797da595920a
arch/arm/*omap*/
Trivial merge