git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
acc012f
391bcdd
)
Linux-omap rebuilt: Updated to v2.6.36-rc6, merged in few more patches
author
Tony Lindgren
<tony@atomide.com>
Wed, 29 Sep 2010 18:19:10 +0000
(11:19 -0700)
committer
Tony Lindgren
<tony@atomide.com>
Wed, 29 Sep 2010 18:19:10 +0000
(11:19 -0700)
$ git checkout -b tmp-rebuild-
1285784333
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-
1285784333
To view the changes since the last rebuild, please do
$ git diff
391bcddb6252a19a401c8ea271abf6bc7a399c5d
..
acc012f37fc113b0a759aed1726d55c9e27e4b81
arch/arm/*omap*/
Trivial merge