git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
17eb4e3
38e1447
)
Linux-omap rebuilt: Updated to -rc4 with fixes merged
author
Tony Lindgren
<tony@atomide.com>
Fri, 2 Dec 2011 02:03:35 +0000
(18:03 -0800)
committer
Tony Lindgren
<tony@atomide.com>
Fri, 2 Dec 2011 02:03:35 +0000
(18:03 -0800)
$ git checkout -b tmp-rebuild-
1322791391
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-
1322791391
To view the changes since the last rebuild, please do
$ git diff
38e1447b0a0e8d20a232e1e218f38de9af612c30
..
17eb4e3870aba1517558cefdc03844d8316d490d
arch/arm/*omap*/
Merge branch 'master' into tmp-rebuild-
1322791391
Trivial merge