git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
27364e4
b75d2f5
)
Linux-omap rebuilt: Updated to -rc3
author
Tony Lindgren
<tony@atomide.com>
Mon, 30 Aug 2010 15:56:55 +0000
(08:56 -0700)
committer
Tony Lindgren
<tony@atomide.com>
Mon, 30 Aug 2010 15:56:55 +0000
(08:56 -0700)
$ git checkout -b tmp-rebuild-
1283183782
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-
1283183782
To view the changes since the last rebuild, please do
$ git diff
b75d2f548c0923845597f9ee4a23c559f75ff0de
..
27364e486eef747be3c65240806fcbb5dc09cd19
arch/arm/*omap*/
Trivial merge