git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
e941bb0
afd2d11
)
Linux-omap rebuilt: Merged in usb patches for testing
author
Tony Lindgren
<tony@atomide.com>
Fri, 3 Dec 2010 01:13:12 +0000
(17:13 -0800)
committer
Tony Lindgren
<tony@atomide.com>
Fri, 3 Dec 2010 01:13:12 +0000
(17:13 -0800)
$ git checkout -b tmp-rebuild-
1291338740
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-
1291338740
To view the changes since the last rebuild, please do
$ git diff
afd2d11e00520b7440003987be2ee4aab7c32901
..
e941bb02ca8d816222ea627d749bcc6d838cc482
arch/arm/*omap*/
Trivial merge