From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Thu, 17 Feb 2011 17:56:40 +0000 (-0800)
Subject: Merge 2.6.38-rc5 into usb-next
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=66b0835e2bb3d345f060a47bb8c8f883bd25ec2b;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

Merge 2.6.38-rc5 into usb-next

This is needed to resolve some merge conflicts that were found
in the USB host controller patches, and reported by Stephen Rothwell.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

66b0835e2bb3d345f060a47bb8c8f883bd25ec2b