git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
1af36e5
6f20d67
)
Linux-omap rebuilt: Merged clock patches, updated board patches
author
Tony Lindgren
<tony@atomide.com>
Tue, 6 Jul 2010 14:06:54 +0000
(17:06 +0300)
committer
Tony Lindgren
<tony@atomide.com>
Tue, 6 Jul 2010 14:06:54 +0000
(17:06 +0300)
$ git checkout -b tmp-rebuild-
1278425177
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-
1278425177
To view the changes since the last rebuild, please do
$ git diff
6f20d67ede4c9ec87f4778a965801da06e4667ce
..
1af36e55c1fb64f35bca60b114ba1a269f3264d9
arch/arm/*omap*/
Trivial merge