git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
8f318ae
bc74c0e
)
Linux-omap rebuilt: Updated to v2.6.36-rc1
author
Tony Lindgren
<tony@atomide.com>
Mon, 16 Aug 2010 06:27:57 +0000
(09:27 +0300)
committer
Tony Lindgren
<tony@atomide.com>
Mon, 16 Aug 2010 06:27:57 +0000
(09:27 +0300)
$ git checkout -b tmp-rebuild-
1281940042
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-
1281940042
To view the changes since the last rebuild, please do
$ git diff
bc74c0e093b13e44971169a31845b98499688a4c
..
8f318ae25bdabac8db4e1483bfca8ba9ec469509
arch/arm/*omap*/
Trivial merge