From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Wed, 12 Mar 2014 18:40:15 +0000 (-0700)
Subject: Merge 3.14-rc6 into usb-next
X-Git-Tag: v3.15-rc1~137^2~21
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=192c028b6ac972df25fd624f94a94d038fbdb66c;p=users%2Fjedix%2Flinux-maple.git

Merge 3.14-rc6 into usb-next

We want the USB fixes in here as well.
---

192c028b6ac972df25fd624f94a94d038fbdb66c