linux/net/rxrpc
David S. Miller f188b951f3 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	drivers/net/ethernet/renesas/ravb_main.c
	kernel/bpf/syscall.c
	net/ipv4/ipmr.c

All three conflicts were cases of overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
2015-12-03 21:09:12 -05:00
..
Kconfig
Makefile
af_rxrpc.c net: Generalise wq_has_sleeper helper 2015-11-30 14:47:33 -05:00
ar-accept.c
ar-ack.c rxrpc: Correctly handle ack at end of client call transmit phase 2015-11-24 17:14:50 -05:00
ar-call.c
ar-connection.c mm, page_alloc: distinguish between being unable to sleep, unwilling to sleep and avoiding waking kswapd 2015-11-06 17:50:42 -08:00
ar-connevent.c
ar-error.c
ar-input.c
ar-internal.h
ar-key.c
ar-local.c
ar-output.c net: rename SOCK_ASYNC_NOSPACE and SOCK_ASYNC_WAITDATA 2015-12-01 15:45:05 -05:00
ar-peer.c
ar-proc.c
ar-recvmsg.c
ar-security.c
ar-skbuff.c
ar-transport.c
rxkad.c
sysctl.c