summaryrefslogtreecommitdiff
path: root/sound/pci/vx222
ModeNameSize
-rw-r--r--Makefile160logplain
-rw-r--r--vx222.c7140logplain
-rw-r--r--vx222.h4306logplain
-rw-r--r--vx222_ops.c35778logplain
b0977b2cb942351f13d2b178'>6d04dfc8966019b8b0977b2cb942351f13d2b178 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
All merge conflicts were simple overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/usb/dwc3/ulpi.c')