git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
2abf179
ddfc2d1
)
Linux-omap rebuilt: Updated to -rc2
author
Tony Lindgren
<tony@atomide.com>
Fri, 27 Aug 2010 21:35:12 +0000
(14:35 -0700)
committer
Tony Lindgren
<tony@atomide.com>
Fri, 27 Aug 2010 21:35:12 +0000
(14:35 -0700)
$ git checkout -b tmp-rebuild-
1282944859
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-
1282944859
To view the changes since the last rebuild, please do
$ git diff
ddfc2d1e9a98100519b2e69e953a6af3b2c355c5
..
2abf179d9e86e24d15dcefe707d8f4e853e41dd5
arch/arm/*omap*/
Trivial merge