git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
48cb661
0dbc346
)
Linux-omap rebuilt: Updated to -rc4 with cleanup merged
author
Tony Lindgren
<tony@atomide.com>
Wed, 7 Aug 2013 11:12:59 +0000
(
04:12
-0700)
committer
Tony Lindgren
<tony@atomide.com>
Wed, 7 Aug 2013 11:12:59 +0000
(
04:12
-0700)
$ git checkout -b tmp-rebuild-
1375873971
linus
$ git merge -m "Merge omap-for-v3.12/tmp-merge" omap-for-v3.12/tmp-merge
$ git merge -s ours master
$ git checkout master
$ git merge tmp-rebuild-
1375873971
To view the changes since the last rebuild, please do
$ git diff
0dbc3463c8606e8122f3c8aea9815d0ef6e66bf9
..
48cb6611b790c6f6f80098796ed433fb4392022b
arch/arm/*omap*/
Trivial merge