git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
e599f12
c446167
)
Linux-omap rebuilt: omap-fixes merged to mainline, for-next changed
author
Tony Lindgren
<tony@atomide.com>
Fri, 5 Feb 2010 04:07:44 +0000
(20:07 -0800)
committer
Tony Lindgren
<tony@atomide.com>
Fri, 5 Feb 2010 04:07:44 +0000
(20:07 -0800)
$ git checkout -b tmp-rebuild-
1265342855
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-
1265342855
To view the changes since the last rebuild, please do
$ git diff
c4461675c40f13222f04512bebae570aead2ebee
..
e599f12601d91bcca5212e30c326d975f71a1422
arch/arm/*omap*/
Trivial merge