git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
94673e5
ec596cc
)
Linux-omap rebuilt: Updated to v2.6.32-rc6
author
Tony Lindgren
<tony@atomide.com>
Wed, 4 Nov 2009 21:03:47 +0000
(13:03 -0800)
committer
Tony Lindgren
<tony@atomide.com>
Wed, 4 Nov 2009 21:03:47 +0000
(13:03 -0800)
$ git checkout -b tmp-rebuild-
1257368620
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 -m "Merge ehci" ehci
$ git merge -s ours master
$ git checkout master
$ git merge tmp-rebuild-
1257368620
To view the changes since the last rebuild, please do
$ git diff
ec596cc39c3a8d542d1831cc9ba0f04e57ed3297
..
94673e5419804d563d25c6ca235b919178b9f01f
arch/arm/*omap*/
Merge branch 'master' into tmp-rebuild-
1257368620
Trivial merge