git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
024a97d
c287f2c
)
Linux-omap rebuilt: arm changes merged to mainline, final omap changes for 2.6.36
author
Tony Lindgren
<tony@atomide.com>
Wed, 4 Aug 2010 15:33:28 +0000
(18:33 +0300)
committer
Tony Lindgren
<tony@atomide.com>
Wed, 4 Aug 2010 15:33:28 +0000
(18:33 +0300)
$ git checkout -b tmp-rebuild-
1280935982
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-
1280935982
To view the changes since the last rebuild, please do
$ git diff
c287f2c5e0b80a272b9ee2032feef7366dcc1e64
..
024a97de33fc7e1138ab1641a2f99f660feae36a
arch/arm/*omap*/
Trivial merge