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
f4a6715c11f7f2 (diff)parent926af6273fc683cd98cd0ce7bf0d04a02eed6742 (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 'net/mac80211/trace.h')