From: Alan Stern <stern@rowland.harvard.edu>
Date: Thu, 21 Mar 2013 16:48:42 +0000 (-0400)
Subject: USB: EHCI: fix up incorrect merge resolution
X-Git-Tag: omap-for-v3.10/dt-fixes-for-merge-window~135^2~227
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=417c765af914106f5e76c4e0181dd555fe6a89a0;p=pandora-kernel.git

USB: EHCI: fix up incorrect merge resolution

This patch (as1671) fixes up an incorrect resolution of a merge
conflict between Greg KH's usb-linus branch and his usb-next branch.

Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

Reading git-diff-tree failed