git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
95d70ea
e329834
)
Linux-omap rebuilt: Updated fixes for modsplit merge
author
Tony Lindgren
<tony@atomide.com>
Mon, 7 Nov 2011 20:36:01 +0000
(12:36 -0800)
committer
Tony Lindgren
<tony@atomide.com>
Mon, 7 Nov 2011 20:36:01 +0000
(12:36 -0800)
$ git checkout -b tmp-rebuild-
1320698137
linus
$ git merge -m "Merge fixes testing-misc cleanup dt soc board testing-board cbus" fixes testing-misc cleanup dt soc board testing-board cbus
$ git merge -s ours master
$ git checkout master
$ git merge tmp-rebuild-
1320698137
To view the changes since the last rebuild, please do
$ git diff
e329834e450d1fe89975f54d0eb421951425761c
..
95d70ea90b23e4798ba0e7b8826e7d9cd7c65032
arch/arm/*omap*/
Merge branch 'master' into tmp-rebuild-
1320698137
Trivial merge