git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
0cdc3bf
8d86ea8
)
Linux-omap rebuilt: Updated with various fixes
author
Tony Lindgren
<tony@atomide.com>
Wed, 20 Jun 2012 14:52:27 +0000
(07:52 -0700)
committer
Tony Lindgren
<tony@atomide.com>
Wed, 20 Jun 2012 14:52:27 +0000
(07:52 -0700)
$ git checkout -b tmp-rebuild-
1340203934
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-
1340203934
To view the changes since the last rebuild, please do
$ git diff
8d86ea8931a05c53fbe8ed375780bd9f83cdf1d3
..
0cdc3bf9c40ea19bf8b05625c3ae963c5d875c65
arch/arm/*omap*/
Trivial merge