git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
302aa37
71c880a
)
Linux-omap rebuilt: Merged in yet more board patches
author
Tony Lindgren
<tony@atomide.com>
Wed, 29 Sep 2010 00:12:19 +0000
(17:12 -0700)
committer
Tony Lindgren
<tony@atomide.com>
Wed, 29 Sep 2010 00:12:19 +0000
(17:12 -0700)
$ git checkout -b tmp-rebuild-
1285719126
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-
1285719126
To view the changes since the last rebuild, please do
$ git diff
71c880af8d49df7a6785178eddd91b9bbeb288aa
..
302aa375609a70e1056c1daa7a3413b02317d767
arch/arm/*omap*/
Trivial merge