git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
8b7cb99
d8ebff3
)
Linux-omap rebuilt: clock fixes merged
author
Tony Lindgren
<tony@atomide.com>
Wed, 20 Jan 2010 21:32:34 +0000
(13:32 -0800)
committer
Tony Lindgren
<tony@atomide.com>
Wed, 20 Jan 2010 21:32:34 +0000
(13:32 -0800)
$ git checkout -b tmp-rebuild-
1264023127
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-
1264023127
To view the changes since the last rebuild, please do
$ git diff
af4d95835608bca858fb2f65b1aaec5438db1311
..
8b7cb99fcb6e2649fb3411710e2bc9e3e4ef7b55
arch/arm/*omap*/
Trivial merge