git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
2e8823e
5ec5d85
)
Linux-omap rebuilt: Clean-up, board, l2x0 merged, DMA merged for testing
author
Tony Lindgren
<tony@atomide.com>
Tue, 21 Dec 2010 03:33:29 +0000
(19:33 -0800)
committer
Tony Lindgren
<tony@atomide.com>
Tue, 21 Dec 2010 03:33:29 +0000
(19:33 -0800)
$ git checkout -b tmp-rebuild-
1292902357
linus
$ git merge -m "Merge for-next omap-testing cbus" for-next omap-testing cbus
$ git pull git://gitorious.org/usb/usb.git musb-hw
$ git merge -s ours master
$ git checkout master
$ git merge tmp-rebuild-
1292902357
To view the changes since the last rebuild, please do
$ git diff
5ec5d855170a705b6c79be32709671fd3b8240cb
..
2e8823ef4fab881317e3301cae307bc3427d0514
arch/arm/*omap*/
Trivial merge