Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-06 12:11:59 +00:00
Code Issues Packages Projects Releases Wiki Activity
d518825eab
linux/net/dns_resolver
History
David S. Miller 902455e007 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	net/core/rtnetlink.c
	net/core/skbuff.c

Both conflicts were very simple overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
2014-06-11 16:02:55 -07:00
..
dns_key.c net/*: Fix FSF address in file headers 2013-12-06 12:37:57 -05:00
dns_query.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2014-06-11 16:02:55 -07:00
internal.h net/*: Fix FSF address in file headers 2013-12-06 12:37:57 -05:00
Kconfig [DNS RESOLVER] Minor typo correction 2010-08-06 03:18:09 +00:00
Makefile Net: dns_resolver: Makefile: Remove deprecated kbuild goal definitions 2010-11-22 08:16:10 -08:00