From: Greg Kroah-Hartman Date: Thu, 28 Mar 2013 18:00:55 +0000 (-0700) Subject: Merge branch 'usb-linus' into usb-next X-Git-Tag: v3.10-rc1~190^2~114 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=02d5f0857bc2962625fa2d34957d43a9e3175eb4;p=users%2Fjedix%2Flinux-maple.git Merge branch 'usb-linus' into usb-next This lets us fix the build error that happens when these two trees are merged together. Signed-off-by: Greg Kroah-Hartman --- 02d5f0857bc2962625fa2d34957d43a9e3175eb4