git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
76392c6
0aaf485
)
Linux-omap rebuilt: omap-fixes in mainline, for-next merged with new boards
author
Tony Lindgren
<tony@atomide.com>
Fri, 13 Nov 2009 00:23:26 +0000
(16:23 -0800)
committer
Tony Lindgren
<tony@atomide.com>
Fri, 13 Nov 2009 00:23:26 +0000
(16:23 -0800)
$ git checkout -b tmp-rebuild-
1258071714
linus
$ 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 -m "Merge cbus" cbus
$ git merge -s ours master
$ git checkout master
$ git merge tmp-rebuild-
1258071714
To view the changes since the last rebuild, please do
$ git diff
0aaf4859f62d2ead2dd949646d12b0216439facd
..
76392c68f813da30aa3e3256db80d8e6df8c8333
arch/arm/*omap*/
Merge branch 'master' into tmp-rebuild-
1258071714
Trivial merge