From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Tue, 13 Nov 2012 18:33:29 +0000 (-0800)
Subject: Merge 3.7-rc5 into usb-next
X-Git-Tag: v3.8-rc1~176^2~53
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=b240add62c7c0e15bfaba59fa37bd44480e31681;p=users%2Fjedix%2Flinux-maple.git

Merge 3.7-rc5 into usb-next

This pulls in the 3.7-rc5 branch into usb-next
---

b240add62c7c0e15bfaba59fa37bd44480e31681