git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
90051aa
ea2c109
)
Linux-omap rebuilt: Updated to -rc6
author
Tony Lindgren
<tony@atomide.com>
Tue, 13 Sep 2011 17:09:24 +0000
(10:09 -0700)
committer
Tony Lindgren
<tony@atomide.com>
Tue, 13 Sep 2011 17:09:24 +0000
(10:09 -0700)
$ git checkout -b tmp-rebuild-
1315933749
linus
$ git merge -m "Merge fixes cleanup board testing-misc testing-board cbus" fixes cleanup board testing-misc testing-board cbus
$ git merge -s ours master
$ git checkout master
$ git merge tmp-rebuild-
1315933749
To view the changes since the last rebuild, please do
$ git diff
b6fd41e29dea9c6753b1843a77e50433e6123bcb
..
90051aa180af37d2747aa32d1aef7bf81cecdf10
arch/arm/*omap*/
Merge branch 'master' into tmp-rebuild-
1315933749
Trivial merge