git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
c8d36ca
c99573a
)
Linux-omap rebuilt: Updated with fixes and branches from Kevin
author
Tony Lindgren
<tony@atomide.com>
Wed, 27 Jun 2012 16:20:09 +0000
(09:20 -0700)
committer
Tony Lindgren
<tony@atomide.com>
Wed, 27 Jun 2012 16:20:09 +0000
(09:20 -0700)
$ git checkout -b tmp-rebuild-
1340813995
linus
$ git merge -m "Merge fixes fixes-non-critical dt testing-misc tmp-merge testing-board cbus" fixes fixes-non-critical dt testing-misc tmp-merge testing-board cbus
$ git merge -s ours master
$ git checkout master
$ git merge tmp-rebuild-
1340813995
To view the changes since the last rebuild, please do
$ git diff
c99573a43e3233900bf18948a45cf9411cc14932
..
c8d36cab2c34f48b2b3385b4da148276d43d4366
arch/arm/*omap*/
Trivial merge