summaryrefslogtreecommitdiff
path: root/drivers/usb/image
ModeNameSize
-rw-r--r--Kconfig1014logplain
-rw-r--r--Makefile116logplain
-rw-r--r--mdc800.c24767logplain
-rw-r--r--microtek.c23192logplain
-rw-r--r--microtek.h1014logplain
6af6273fc683cd98cd0ce7bf0d04a02eed6742 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
The conflict was an interaction between a bug fix in the netvsc driver in 'net' and an optimization of the RX path in 'net-next'. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/uapi/xen/privcmd.h')