git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
dc049de
49ff71e
)
Linux-omap rebuilt: Updated with some late patches and new cbus patches
author
Tony Lindgren
<tony@atomide.com>
Fri, 21 Sep 2012 23:33:20 +0000
(16:33 -0700)
committer
Tony Lindgren
<tony@atomide.com>
Fri, 21 Sep 2012 23:33:20 +0000
(16:33 -0700)
$ git checkout -b tmp-rebuild-
1348270393
linus
$ git merge -m "Merge fixes fixes-noncritical testing-misc tmp-merge testing-board" fixes fixes-noncritical testing-misc tmp-merge testing-board
$ git merge -s ours master
$ git checkout master
$ git merge tmp-rebuild-
1348270393
To view the changes since the last rebuild, please do
$ git diff
49ff71ecdbfaca0f9b9fbdb7f58b070f0878c06c
..
dc049de795abd2904f67ee08c2bdec572ace46a1
arch/arm/*omap*/
Trivial merge