git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
eae69c1
dae4b02
)
Linux-omap rebuilt: Updated fixes
author
Tony Lindgren
<tony@atomide.com>
Sat, 19 Nov 2011 01:15:35 +0000
(17:15 -0800)
committer
Tony Lindgren
<tony@atomide.com>
Sat, 19 Nov 2011 01:15:35 +0000
(17:15 -0800)
$ git checkout -b tmp-rebuild-
1321665181
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-
1321665181
To view the changes since the last rebuild, please do
$ git diff
dae4b02a6ad0afc4a4e72054aaae10e8fc37d717
..
eae69c1bc01d259854047da163eac5079e9f3904
arch/arm/*omap*/
Merge branch 'master' into tmp-rebuild-
1321665181
Trivial merge