git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
5824633
fd09a21
)
Linux-omap rebuilt: Merged in more boards and few more testing patches
author
Tony Lindgren
<tony@atomide.com>
Tue, 28 Sep 2010 00:18:54 +0000
(17:18 -0700)
committer
Tony Lindgren
<tony@atomide.com>
Tue, 28 Sep 2010 00:18:54 +0000
(17:18 -0700)
$ git checkout -b tmp-rebuild-
1285633086
linus
$ git merge -m "Merge cbus" cbus
$ git merge -m "Merge omap-fixes" omap-fixes
$ git merge -m "Merge omap-testing" omap-testing
$ git merge -m "Merge for-next" for-next
$ git merge -s ours master
$ git checkout master
$ git merge tmp-rebuild-
1285633086
To view the changes since the last rebuild, please do
$ git diff
ea4d2a31524b00b03ce4548989be209e155cc43a
..
5824633f9ddb4370d2824a3a7cb5ea20d764d12f
arch/arm/*omap*/
Trivial merge