git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
5cd76e3
a6b56c4
)
Linux-omap rebuilt: for-next updated with clock changes
author
Tony Lindgren
<tony@atomide.com>
Thu, 25 Feb 2010 04:57:55 +0000
(20:57 -0800)
committer
Tony Lindgren
<tony@atomide.com>
Thu, 25 Feb 2010 04:57:55 +0000
(20:57 -0800)
$ git checkout -b tmp-rebuild-
1267073865
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-
1267073865
To view the changes since the last rebuild, please do
$ git diff
a6b56c473cc1d9fccfd8827a3f76e28f7e9a1344
..
5cd76e35e48271bc88de9e9da21659aca7df496e
arch/arm/*omap*/
Trivial merge