David S. Miller b05930f5d1 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Conflicts:
	drivers/net/wireless/iwlwifi/pcie/trans.c
	include/linux/inetdevice.h

The inetdevice.h conflict involves moving the IPV4_DEVCONF values
into a UAPI header, overlapping additions of some new entries.

The iwlwifi conflict is a context overlap.

Signed-off-by: David S. Miller <davem@davemloft.net>

2013-08-26 16:37:08 -04:00

..

af_packet.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2013-08-26 16:37:08 -04:00

diag.c

sock_diag: allow to dump bpf filters

2013-04-29 13:21:30 -04:00

internal.h

packet: account statistics only in tpacket_stats_u

2013-04-25 01:29:43 -04:00

Kconfig

packet: Diag core and basic socket info dumping

2012-08-14 16:56:33 -07:00

Makefile

packet: Diag core and basic socket info dumping

2012-08-14 16:56:33 -07:00