From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 16 Jul 2012 20:16:09 +0000 (-0700)
Subject: Merge 3.5-rc7 into usb-next
X-Git-Tag: v3.6-rc1~101^2~53
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b903bd69e3fa156598def8d6433dfe5352af8da3;p=thirdparty%2Fkernel%2Flinux.git

Merge 3.5-rc7 into usb-next

This resolves the merge issue with the drivers/usb/host/ehci-omap.c
file.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

b903bd69e3fa156598def8d6433dfe5352af8da3