git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
796978c
56d7e92
)
Linux-omap rebuilt: Merged in serial errata patches, for-next patches updated
author
Tony Lindgren
<tony@atomide.com>
Wed, 7 Jul 2010 12:40:18 +0000
(15:40 +0300)
committer
Tony Lindgren
<tony@atomide.com>
Wed, 7 Jul 2010 12:40:18 +0000
(15:40 +0300)
$ git checkout -b tmp-rebuild-
1278506396
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-
1278506396
To view the changes since the last rebuild, please do
$ git diff
56d7e929ca22710c6db33b620da8a25f87e4e286
..
796978cb43ee9af4d6d34c6d1df94672c945e885
arch/arm/*omap*/
Trivial merge