git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
51ee802
69cff35
)
Linux-omap rebuilt: Updated to v3.10-rc5 with pending branches
author
Tony Lindgren
<tony@atomide.com>
Mon, 10 Jun 2013 04:26:09 +0000
(21:26 -0700)
committer
Tony Lindgren
<tony@atomide.com>
Mon, 10 Jun 2013 04:26:09 +0000
(21:26 -0700)
$ git checkout -b tmp-rebuild-
1370838360
linus
$ git merge -m "Merge omap-for-v3.11/tmp-merge" omap-for-v3.11/tmp-merge
$ git merge -s ours master
$ git checkout master
$ git merge tmp-rebuild-
1370838360
To view the changes since the last rebuild, please do
$ git diff
69cff356556794f3ec6661322f8aea4aa4bb1f47
..
51ee802503154fab37173b027aa2a20136145baf
arch/arm/*omap*/
Trivial merge