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_netlink.c

netlink: Eliminate kmalloc in netlink dump operation.

2013-08-15 15:51:20 -07:00

af_netlink.h

netlink: Eliminate kmalloc in netlink dump operation.

2013-08-15 15:51:20 -07:00

diag.c

netlink: Fix build with mmap disabled.

2013-04-23 15:39:03 -04:00

genetlink.c

Revert "genetlink: fix family dump race"

2013-08-22 13:24:02 -07:00

Kconfig

netlink: kconfig: move mmap i/o into netlink kconfig

2013-05-01 15:02:42 -04:00

Makefile

netlink: Diag core and basic socket info dumping (v2)

2013-03-21 12:38:03 -04:00