git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
dd09b34
5c45000
)
Linux-omap rebuilt: omap-fixes merged
author
Tony Lindgren
<tony@atomide.com>
Wed, 6 Jan 2010 00:34:58 +0000
(16:34 -0800)
committer
Tony Lindgren
<tony@atomide.com>
Wed, 6 Jan 2010 00:34:58 +0000
(16:34 -0800)
$ git checkout -b tmp-rebuild-
1262738090
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-
1262738090
To view the changes since the last rebuild, please do
$ git diff
5c45000a8c85cacfc1e9ad712ae2c729b08f5609
..
dd09b34177e4ea23b0c69084ceca5cf5642e5573
arch/arm/*omap*/
Trivial merge