From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 23 Mar 2015 20:49:37 +0000 (+0100)
Subject: Merge 4.0-rc5 into usb-next
X-Git-Tag: firefly_0821_release~176^2~2000^2~56
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=cd0e075784f4bce97b4ed47d4b354f045e895546;p=firefly-linux-kernel-4.4.55.git

Merge 4.0-rc5 into usb-next

We want the USB fixes in here as well to resolve merge conflicts.

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

cd0e075784f4bce97b4ed47d4b354f045e895546