git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
fbbd584
2db863f
)
Linux-omap rebuilt: Updated to -rc6
author
Tony Lindgren
<tony@atomide.com>
Mon, 9 Jul 2012 14:18:08 +0000
(07:18 -0700)
committer
Tony Lindgren
<tony@atomide.com>
Mon, 9 Jul 2012 14:18:08 +0000
(07:18 -0700)
$ git checkout -b tmp-rebuild-
1341843475
linus
$ git merge -m "Merge fixes fixes-non-critical testing-misc tmp-merge testing-board cbus" fixes fixes-non-critical testing-misc tmp-merge testing-board cbus
$ git merge -s ours master
$ git checkout master
$ git merge tmp-rebuild-
1341843475
To view the changes since the last rebuild, please do
$ git diff
2db863ff368f5922e3f1398fa6b4c20d5ed1d888
..
fbbd584ca197cda99a5fb5e25e0dfe7e945e8809
arch/arm/*omap*/
Trivial merge