From: Greg Kroah-Hartman Date: Thu, 5 Jul 2012 22:10:09 +0000 (-0700) Subject: Merge tag 'gadget-for-v3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi... X-Git-Tag: firefly_0821_release~3680^2~2357^2~24^2~35 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=94ff447cf275170042a7a05b972b6da8b94754ca;p=firefly-linux-kernel-4.4.55.git Merge tag 'gadget-for-v3.6' of git://git./linux/kernel/git/balbi/usb into usb-next usb: gadget: patches for v3.6 merge window This is quite a big pull request and contains patches all over the place. omap_udc is now a bit cleaner after removing omap2 support, fixing some checkpatch.pl warnings and errors, switching over to generic map/unmap routines and preventing a NULL pointer de-reference. s3c-hsotg has been switched over to devm_* API, got some locking fixes and improvements and it also got an implementation for the pullup() method. the mass storage gadgets changed default value of the removable parameter, dropped some unused options and made "file" and "ro" module_parameters read-only in some cases. ffs function got support for HID descriptor. Some UDCs have been converted to clk_prepare_enable() and clk_disable_unprepare(). Marvell now got support for its USB3 controller in mainline after introducing its mv_u3d_core.c driver. --- 94ff447cf275170042a7a05b972b6da8b94754ca