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

Conflicts:
	drivers/net/ethernet/rocker/rocker.c

The rocker commit was two overlapping changes, one to rename
the ->vport member to ->pport, and another making the bitmask
expression use '1ULL' instead of plain '1'.

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

2015-03-03 21:16:48 -05:00

..

af_packet.c

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

2015-03-03 21:16:48 -05:00

diag.c

netlink: make nlmsg_end() and genlmsg_end() void

2015-01-18 01:03:45 -05:00

internal.h

…

Kconfig

…

Makefile

…