git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
65eda9a
2e51807
)
Linux-omap rebuilt: Updated to -rc3
author
Tony Lindgren
<tony@atomide.com>
Wed, 31 Mar 2010 12:04:38 +0000
(
05:04
-0700)
committer
Tony Lindgren
<tony@atomide.com>
Wed, 31 Mar 2010 12:04:38 +0000
(
05:04
-0700)
$ git checkout -b tmp-rebuild-
1270037067
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-
1270037067
To view the changes since the last rebuild, please do
$ git diff
2e51807a2bd2ad04ef85fa6c28615412747a8ff1
..
65eda9a92a7117e8672c9e3c5b121cd713e24335
arch/arm/*omap*/
Trivial merge