git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
c9d7e84
e4a2b35
)
Merge branch 'musb-hw' of git://gitorious.org/usb/usb into tmp-rebuild-1292981503
author
Tony Lindgren
<tony@atomide.com>
Wed, 22 Dec 2010 01:32:36 +0000
(17:32 -0800)
committer
Tony Lindgren
<tony@atomide.com>
Wed, 22 Dec 2010 01:32:36 +0000
(17:32 -0800)
Conflicts:
arch/arm/mach-omap2/Kconfig
drivers/usb/gadget/composite.c
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