git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
50810eb
b8fe178
)
Linux-omap rebuilt: Updated to v3.4-rc1, merged in most of pending branches
author
Tony Lindgren
<tony@atomide.com>
Tue, 3 Apr 2012 18:39:25 +0000
(11:39 -0700)
committer
Tony Lindgren
<tony@atomide.com>
Tue, 3 Apr 2012 18:39:25 +0000
(11:39 -0700)
$ git checkout -b tmp-rebuild-
1333478349
linus
$ git merge -m "Merge fixes fixes-non-critical tmp-merge dt testing-misc testing-board cbus" fixes fixes-non-critical tmp-merge dt testing-misc testing-board cbus
$ git merge -s ours master
$ git checkout master
$ git merge tmp-rebuild-
1333478349
To view the changes since the last rebuild, please do
$ git diff
b8fe1781ec8bed5e086691a827a6ee11facec2aa
..
50810ebe5051acaf01c6ed7ff04718c8d8655593
arch/arm/*omap*/
Merge branch 'master' into tmp-rebuild-
1333478349
Trivial merge