From: Greg Kroah-Hartman Date: Wed, 20 Mar 2013 23:21:47 +0000 (-0700) Subject: Merge branch 'usb-linus' into usb-next X-Git-Tag: omap-for-v3.10/dt-fixes-for-merge-window~135^2~229 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cf2d9500a5a0df61713b56f2f40aa0b81a6f9f63;p=pandora-kernel.git Merge branch 'usb-linus' into usb-next This is to pick up the fixes in that branch, and let Alan fix the merge error in drivers/usb/host/ehci-timer.c better than I just did (as I know I messed it up...) Signed-off-by: Greg Kroah-Hartman --- cf2d9500a5a0df61713b56f2f40aa0b81a6f9f63 Reading git-diff-tree failed