git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
eddda6e
e7e7a61
)
Linux-omap rebuilt: for-next with PM off mode merged
author
Tony Lindgren
<tony@atomide.com>
Thu, 12 Nov 2009 02:50:37 +0000
(18:50 -0800)
committer
Tony Lindgren
<tony@atomide.com>
Thu, 12 Nov 2009 02:50:37 +0000
(18:50 -0800)
$ git checkout -b tmp-rebuild-
1257994230
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-
1257994230
To view the changes since the last rebuild, please do
$ git diff
e7e7a613eded2732b68496f69ff8fc34f16e1dd0
..
eddda6ee60456ec575ac14b26fd8b40f5ed74922
arch/arm/*omap*/
Merge branch 'master' into tmp-rebuild-
1257994230
Trivial merge