git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
7362c98
01c0bca
)
Linux-omap rebuilt: Updated to 2.6.35-rc4, omap for-next updated
author
Tony Lindgren
<tony@atomide.com>
Mon, 5 Jul 2010 14:05:35 +0000
(17:05 +0300)
committer
Tony Lindgren
<tony@atomide.com>
Mon, 5 Jul 2010 14:05:35 +0000
(17:05 +0300)
$ git checkout -b tmp-rebuild-
1278338713
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-
1278338713
To view the changes since the last rebuild, please do
$ git diff
01c0bcae6f23e418994af11ad3f3b648d93e3f1b
..
7362c98e7939486e6f8744b474776a5aaf4f417f
arch/arm/*omap*/
Trivial merge