git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
736e812
713fcd9
)
Linux-omap rebuilt: Updated with patches for v3.14 to make mach-omap2 boot with devic...
author
Tony Lindgren
<tony@atomide.com>
Sun, 8 Dec 2013 22:47:36 +0000
(14:47 -0800)
committer
Tony Lindgren
<tony@atomide.com>
Sun, 8 Dec 2013 22:47:36 +0000
(14:47 -0800)
$ git checkout -b tmp-rebuild-
1386542850
linus
$ git merge -m "Merge omap-for-v3.14/omap3-board-removal" omap-for-v3.14/omap3-board-removal
$ git merge -s ours master
$ git checkout master
$ git merge tmp-rebuild-
1386542850
To view the changes since the last rebuild, please do
$ git diff
713fcd98a8f74388e986fe11d7dd0a7fbcbe4077
..
736e812636ea72be444b85fa7e92554967459069
arch/arm/*omap*/
Trivial merge