git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: b5a3b3d)
usb: musb: Fix for merge issue
authorHema HK <hemahk@ti.com>
Thu, 17 Mar 2011 10:41:58 +0000 (16:11 +0530)
committerGreg Kroah-Hartman <gregkh@suse.de>
Wed, 23 Mar 2011 20:14:17 +0000 (13:14 -0700)
There was conflict while merging 2 patches. Enabling vbus code
is wrongly moved to error check if loop.

This is a fix to resolve the merge issue.

Signed-off-by: Hema HK <hemahk@ti.com>
Cc: Felipe Balbi <balbi@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

No differences found
Pandora Kernel Repository