git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
6251213
40a0c47
)
Linux-omap rebuilt: Updated with patches going into 2.6.36
author
Tony Lindgren
<tony@atomide.com>
Tue, 3 Aug 2010 09:18:31 +0000
(12:18 +0300)
committer
Tony Lindgren
<tony@atomide.com>
Tue, 3 Aug 2010 09:18:31 +0000
(12:18 +0300)
$ git checkout -b tmp-rebuild-
1280827087
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-
1280827087
To view the changes since the last rebuild, please do
$ git diff
40a0c47b194c4f31af8b30c2d01f4df5bb8cb552
..
62512135bafabc2432ea8d674a7d5452c4686a3a
arch/arm/*omap*/
Trivial merge