git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
d4896f5
3c56ce0
)
Linux-omap rebuilt: updated to -rc4
author
Tony Lindgren
<tony@atomide.com>
Mon, 25 Jun 2012 15:32:58 +0000
(08:32 -0700)
committer
Tony Lindgren
<tony@atomide.com>
Mon, 25 Jun 2012 15:32:58 +0000
(08:32 -0700)
$ git checkout -b tmp-rebuild-
1340638365
linus
$ git merge -m "Merge fixes fixes-non-critical dt testing-misc tmp-merge testing-board cbus" fixes fixes-non-critical dt testing-misc tmp-merge testing-board cbus
$ git merge -s ours master
$ git checkout master
$ git merge tmp-rebuild-
1340638365
To view the changes since the last rebuild, please do
$ git diff
3c56ce07072eef35a30f71fce9748adcbb31ce8d
..
d4896f5b90be2bf6010dd134eb6d98ee15d5110c
arch/arm/*omap*/
Trivial merge