git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
30ec3ec
c6348aa
)
Linux-omap rebuilt: mmc changes and multi-omap4 merged
author
Tony Lindgren
<tony@atomide.com>
Tue, 2 Feb 2010 02:53:51 +0000
(18:53 -0800)
committer
Tony Lindgren
<tony@atomide.com>
Tue, 2 Feb 2010 02:53:51 +0000
(18:53 -0800)
$ git checkout -b tmp-rebuild-
1265079223
linus
$ 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 -m "Merge cbus" cbus
$ git merge -s ours master
$ git checkout master
$ git merge tmp-rebuild-
1265079223
To view the changes since the last rebuild, please do
$ git diff
c6348aa7a2ee28d02774cf437252c87143ff8bf9
..
30ec3ec32bd533b4a0bf7da3fd1bb255d74b9d10
arch/arm/*omap*/
Trivial merge