From: Greg Kroah-Hartman Date: Mon, 23 Sep 2013 20:24:10 +0000 (-0700) Subject: Merge branch 'master' into usb-next X-Git-Tag: v3.13-rc1~174^2~178 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=dc4fea795bf7e3f80dbfa3a40b8ab89427e9aed5;p=kernel%2Fkernel-generic.git Merge branch 'master' into usb-next We have USB fixes now in Linus's tree that we need to properly sort out with reverts and the like in the usb-next branch, so merge them together and do it by hand. Signed-off-by: Greg Kroah-Hartman --- dc4fea795bf7e3f80dbfa3a40b8ab89427e9aed5