git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
926cd18
c616d49
)
Linux-omap rebuilt: Updated to -rc5, merged in fixes and some board and dt changes
author
Tony Lindgren
<tony@atomide.com>
Mon, 2 Jul 2012 13:20:27 +0000
(06:20 -0700)
committer
Tony Lindgren
<tony@atomide.com>
Mon, 2 Jul 2012 13:20:27 +0000
(06:20 -0700)
$ git checkout -b tmp-rebuild-
1341235211
linus
$ git merge -m "Merge fixes fixes-non-critical testing-misc tmp-merge testing-board cbus" fixes fixes-non-critical testing-misc tmp-merge testing-board cbus
$ git merge -s ours master
$ git checkout master
$ git merge tmp-rebuild-
1341235211
To view the changes since the last rebuild, please do
$ git diff
c616d49a24186877e6b8767aa41f9c0f9fed20c7
..
926cd189f5aaff5ff66808075be463299f7314b2
arch/arm/*omap*/
Trivial merge