git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
b094f89
6bd61e8
)
Linux-omap rebuilt: Rebuilt again, now with the right pending branches
author
Tony Lindgren
<tony@atomide.com>
Fri, 20 Apr 2012 00:47:43 +0000
(17:47 -0700)
committer
Tony Lindgren
<tony@atomide.com>
Fri, 20 Apr 2012 00:47:43 +0000
(17:47 -0700)
$ git checkout -b tmp-rebuild-
1334882851
linus
$ git merge -m "Merge fixes fixes-non-critical tmp-merge dt testing-misc testing-board cbus" fixes fixes-non-critical tmp-merge dt testing-misc testing-board cbus
$ git merge -s ours master
$ git checkout master
$ git merge tmp-rebuild-
1334882851
To view the changes since the last rebuild, please do
$ git diff
6bd61e8de0511dd9831eb9d89eea0b4603a10e9e
..
b094f8965159ab4edb3590bfd800ca30466b69de
arch/arm/*omap*/
Trivial merge