Merge tag 'v3.17-rc5' into usb-next
authorJohan Hovold <johan@kernel.org>
Mon, 15 Sep 2014 16:07:37 +0000 (18:07 +0200)
committerJohan Hovold <johan@kernel.org>
Mon, 15 Sep 2014 16:10:34 +0000 (18:10 +0200)
USB fixes in Linux 3.17-rc5 are needed to build on top of for 3.18.

Signed-off-by: Johan Hovold <johan@kernel.org>

Trivial merge