git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
758b606
a2a6745
)
Linux-omap rebuilt: Updated to -rc6
author
Tony Lindgren
<tony@atomide.com>
Fri, 29 Jan 2010 22:21:03 +0000
(14:21 -0800)
committer
Tony Lindgren
<tony@atomide.com>
Fri, 29 Jan 2010 22:21:03 +0000
(14:21 -0800)
$ git checkout -b tmp-rebuild-
1264803655
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-
1264803655
To view the changes since the last rebuild, please do
$ git diff
a2a6745fc3755623b1bb0c10e7145eb36618ef6a
..
758b606bfcddcca4b50842fcc8f01af884ef1c4a
arch/arm/*omap*/
Trivial merge