git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
a07cf32
f0a9ba0
)
Linux-omap rebuilt: Updated to v2.6.34-rc2
author
Tony Lindgren
<tony@atomide.com>
Mon, 22 Mar 2010 21:09:17 +0000
(14:09 -0700)
committer
Tony Lindgren
<tony@atomide.com>
Mon, 22 Mar 2010 21:09:17 +0000
(14:09 -0700)
$ git checkout -b tmp-rebuild-
1269292146
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-
1269292146
To view the changes since the last rebuild, please do
$ git diff
f0a9ba09c82dfa13a6486989b65c4fa51c9c6512
..
a07cf32d251eca6b033ce985b8c9882b5efe4375
arch/arm/*omap*/
Trivial merge