git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
f8a7400
37ebbcf
)
Linux-omap rebuilt: Updated fixes
author
Tony Lindgren
<tony@atomide.com>
Sat, 5 Nov 2011 00:56:06 +0000
(17:56 -0700)
committer
Tony Lindgren
<tony@atomide.com>
Sat, 5 Nov 2011 00:56:06 +0000
(17:56 -0700)
$ git checkout -b tmp-rebuild-
1320454550
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-
1320454550
To view the changes since the last rebuild, please do
$ git diff
37ebbcf7305762b306f1128ea61f4d91651ed00d
..
f8a740021abe92e81f7167a3c31e86c01bf3148a
arch/arm/*omap*/
Merge branch 'master' into tmp-rebuild-
1320454550
Trivial merge