git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
0723894
08eb030
)
Linux-omap rebuilt: Updated with -rc3, multiplatform and gpmc patches
author
Tony Lindgren
<tony@atomide.com>
Tue, 15 Jan 2013 23:19:34 +0000
(15:19 -0800)
committer
Tony Lindgren
<tony@atomide.com>
Tue, 15 Jan 2013 23:19:34 +0000
(15:19 -0800)
$ git checkout -b tmp-rebuild-
1358291968
linus
$ git merge -m "Merge omap-for-v3.9/multiplatform-enable-signed-v2 omap-for-v3.9/gpmc" omap-for-v3.9/multiplatform-enable-signed-v2 omap-for-v3.9/gpmc
$ git merge -s ours master
$ git checkout master
$ git merge tmp-rebuild-
1358291968
To view the changes since the last rebuild, please do
$ git diff
08eb030740fdc3f401e2db3e43cb90d030215811
..
0723894874e2e8ae4ba1b3dc01bb853349761e90
arch/arm/*omap*/
Trivial merge