Evolution-x-devices/kernel_google_b1c1
2
0
Fork 0
mirror of https://github.com/Evolution-X-Devices/kernel_google_b1c1 synced 2026-02-13 03:10:58 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
43aba7eb0dc052d84e88f3569ea3f030868d49b2
kernel_google_b1c1/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
…
Makefile
…