git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
fecd959
a468c91
)
Linux-omap rebuilt: Updated to 2.6.33-rc2, clock fixes merged
author
Tony Lindgren
<tony@atomide.com>
Tue, 29 Dec 2009 00:57:16 +0000
(16:57 -0800)
committer
Tony Lindgren
<tony@atomide.com>
Tue, 29 Dec 2009 00:57:16 +0000
(16:57 -0800)
$ git checkout -b tmp-rebuild-
1262048216
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-
1262048216
To view the changes since the last rebuild, please do
$ git diff
a468c9100977c3f163bfa9de7af1bbcb5dc5e260
..
fecd959409cbecc17821b7caf7f73f905351479e
arch/arm/*omap*/
Merge branch 'master' into tmp-rebuild-
1262048216
Trivial merge