git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
c7521fa
74de0ab
)
Linux-omap rebuilt: Updated to v3.17-rc4 with pending patches for v3.18
author
Tony Lindgren
<tony@atomide.com>
Tue, 9 Sep 2014 01:29:15 +0000
(18:29 -0700)
committer
Tony Lindgren
<tony@atomide.com>
Tue, 9 Sep 2014 01:29:15 +0000
(18:29 -0700)
$ git checkout -b tmp-rebuild-
1410226149
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-
1410226149
To view the changes since the last rebuild, please do
$ git diff
74de0ab956770dd33d58e65fe21093a2dd42bf6e
..
c7521faf832913a4707b549129720e09c018192c
arch/arm/*omap*/
Trivial merge