git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2a9f431 e4a2b35)
Merge branch 'musb-hw' of git://gitorious.org/usb/usb into tmp-rebuild-1292545203
authorTony Lindgren <tony@atomide.com>
Fri, 17 Dec 2010 00:22:17 +0000 (16:22 -0800)
committerTony Lindgren <tony@atomide.com>
Fri, 17 Dec 2010 00:22:17 +0000 (16:22 -0800)
Conflicts:
drivers/usb/musb/blackfin.c
drivers/usb/musb/musb_core.c
drivers/usb/musb/musb_core.h


Trivial merge
Pandora Kernel Repository