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


Trivial merge
Pandora Kernel Repository