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_rxrpc.c	net: Remove iocb argument from sendmsg and recvmsg	2015-03-02 13:06:31 -05:00
ar-accept.c
ar-ack.c	rxrpc: don't multiply with HZ twice	2015-03-01 13:40:23 -05:00
ar-call.c
ar-connection.c
ar-connevent.c
ar-error.c
ar-input.c
ar-internal.h	net: Remove iocb argument from sendmsg and recvmsg	2015-03-02 13:06:31 -05:00
ar-key.c
ar-local.c
ar-output.c	net: Remove iocb argument from sendmsg and recvmsg	2015-03-02 13:06:31 -05:00
ar-peer.c
ar-proc.c
ar-recvmsg.c	net: Remove iocb argument from sendmsg and recvmsg	2015-03-02 13:06:31 -05:00
ar-security.c
ar-skbuff.c
ar-transport.c
Kconfig
Makefile
rxkad.c
sysctl.c