git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
1032e7f
4245573
)
Merge branch 'musb-hw' of git://gitorious.org/usb/usb into tmp-rebuild-1291780857
author
Tony Lindgren
<tony@atomide.com>
Wed, 8 Dec 2010 04:01:42 +0000
(20:01 -0800)
committer
Tony Lindgren
<tony@atomide.com>
Wed, 8 Dec 2010 04:01:42 +0000
(20:01 -0800)
Conflicts:
drivers/usb/musb/blackfin.c
drivers/usb/musb/musb_core.c
drivers/usb/musb/musb_core.h
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff