git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
8fd4643
f9320af
)
Linux-omap rebuilt: Updated to -rc2
author
Tony Lindgren
<tony@atomide.com>
Tue, 26 Aug 2014 21:16:55 +0000
(14:16 -0700)
committer
Tony Lindgren
<tony@atomide.com>
Tue, 26 Aug 2014 21:16:55 +0000
(14:16 -0700)
$ git checkout -b tmp-rebuild-
1409087810
linus
$ git merge -m "Merge omap-for-v3.17/fixes-v2" omap-for-v3.17/fixes-v2
$ git merge -s ours master
$ git checkout master
$ git merge tmp-rebuild-
1409087810
To view the changes since the last rebuild, please do
$ git diff
52addcf9d6669fa439387610bc65c92fa0980cef
..
8fd46439e1f5a7f86d76a08733459b74debd9468
arch/arm/*omap*/
Trivial merge