From: Greg Kroah-Hartman Date: Fri, 10 Feb 2012 19:12:55 +0000 (-0800) Subject: Merge tag 'usb-3.3-rc3' into usb-next X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=7483948fdd31a8642ef0288aab6f368b98d53c29;p=linux-beck.git Merge tag 'usb-3.3-rc3' into usb-next This is done to resolve a merge conflict with: drivers/usb/class/cdc-wdm.c and to better handle future patches for this driver as it is under active development at the moment. Signed-off-by: Greg Kroah-Hartman --- 7483948fdd31a8642ef0288aab6f368b98d53c29