summaryrefslogtreecommitdiff
path: root/net/dns_resolver
ModeNameSize
-rw-r--r--Kconfig914logplain
-rw-r--r--Makefile131logplain
-rw-r--r--dns_key.c8341logplain
-rw-r--r--dns_query.c4664logplain
-rw-r--r--internal.h1456logplain
ac0545e5184c1c47b&id2=76e0e70e6452b971a69cc9794ff4a6715c11f7f2'>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 'sound/soc/codecs/wm9081.c')