git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
3122dc4
594106e
)
Linux-omap rebuilt: Updated to v3.17-rc5 with pending patches for v3.18
author
Tony Lindgren
<tony@atomide.com>
Thu, 18 Sep 2014 18:36:08 +0000
(11:36 -0700)
committer
Tony Lindgren
<tony@atomide.com>
Thu, 18 Sep 2014 18:36:08 +0000
(11:36 -0700)
$ git checkout -b tmp-rebuild-
1411065363
linus
$ git merge -m "Merge omap-for-v3.18/tmp-merge" omap-for-v3.18/tmp-merge
$ git merge -s ours master
$ git checkout master
$ git merge tmp-rebuild-
1411065363
To view the changes since the last rebuild, please do
$ git diff
594106eeae6c2f1087db20305e5f4aa356bd8906
..
3122dc41fc5ef42017063d77e2362a0c14c88a4d
arch/arm/*omap*/
Trivial merge