git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
7343d74
ac8cf7c
)
Linux-omap rebuilt: omap for-next updated
author
Tony Lindgren
<tony@atomide.com>
Thu, 18 Feb 2010 01:33:30 +0000
(17:33 -0800)
committer
Tony Lindgren
<tony@atomide.com>
Thu, 18 Feb 2010 01:33:30 +0000
(17:33 -0800)
$ git checkout -b tmp-rebuild-
1266456802
linus
$ git merge -m "Merge omap-testing" omap-testing
$ git merge -m "Merge for-next" for-next
$ git merge -m "Merge cbus" cbus
$ git merge -s ours master
$ git checkout master
$ git merge tmp-rebuild-
1266456802
To view the changes since the last rebuild, please do
$ git diff
ac8cf7c39229a44bf125e8f2eef8ea9b7651c343
..
7343d74262a085a23af9506faa76d5e2624ba723
arch/arm/*omap*/
Trivial merge