kernel-fxtec-pro1x/net/rxrpc
David S. Miller 1578b0a5e9 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	net/sched/act_police.c
	net/sched/sch_drr.c
	net/sched/sch_hfsc.c
	net/sched/sch_prio.c
	net/sched/sch_red.c
	net/sched/sch_tbf.c

In net-next the drop methods of the packet schedulers got removed, so
the bug fixes to them in 'net' are irrelevant.

A packet action unload crash fix conflicts with the addition of the
new firstuse timestamp.

Signed-off-by: David S. Miller <davem@davemloft.net>
2016-06-10 11:52:24 -07:00
..
af_rxrpc.c rxrpc: Simplify connect() implementation and simplify sendmsg() op 2016-06-09 23:30:12 -07:00
ar-accept.c rxrpc: Use pr_<level> and pr_fmt, reduce object size a few KB 2016-06-03 19:41:31 -04:00
ar-ack.c rxrpc: Use pr_<level> and pr_fmt, reduce object size a few KB 2016-06-03 19:41:31 -04:00
ar-call.c rxrpc: Simplify connect() implementation and simplify sendmsg() op 2016-06-09 23:30:12 -07:00
ar-connection.c rxrpc: Simplify connect() implementation and simplify sendmsg() op 2016-06-09 23:30:12 -07:00
ar-connevent.c rxrpc: Use pr_<level> and pr_fmt, reduce object size a few KB 2016-06-03 19:41:31 -04:00
ar-error.c rxrpc: Don't try to map ICMP to error as the lower layer already did that 2016-03-04 16:02:03 +00:00
ar-input.c rxrpc: Use pr_<level> and pr_fmt, reduce object size a few KB 2016-06-03 19:41:31 -04:00
ar-internal.h rxrpc: Simplify connect() implementation and simplify sendmsg() op 2016-06-09 23:30:12 -07:00
ar-key.c rxrpc: Use pr_<level> and pr_fmt, reduce object size a few KB 2016-06-03 19:41:31 -04:00
ar-local.c rxrpc: Use pr_<level> and pr_fmt, reduce object size a few KB 2016-06-03 19:41:31 -04:00
ar-output.c rxrpc: Simplify connect() implementation and simplify sendmsg() op 2016-06-09 23:30:12 -07:00
ar-peer.c rxrpc: Use pr_<level> and pr_fmt, reduce object size a few KB 2016-06-03 19:41:31 -04:00
ar-proc.c rxrpc: Differentiate local and remote abort codes in structs 2016-04-11 15:34:40 -04:00
ar-recvmsg.c rxrpc: Use pr_<level> and pr_fmt, reduce object size a few KB 2016-06-03 19:41:31 -04:00
ar-security.c rxrpc: Create a null security type and get rid of conditional calls 2016-04-11 15:34:41 -04:00
ar-skbuff.c rxrpc: Use pr_<level> and pr_fmt, reduce object size a few KB 2016-06-03 19:41:31 -04:00
ar-transport.c rxrpc: Use pr_<level> and pr_fmt, reduce object size a few KB 2016-06-03 19:41:31 -04:00
insecure.c rxrpc: Create a null security type and get rid of conditional calls 2016-04-11 15:34:41 -04:00
Kconfig rxrpc: Absorb the rxkad security module 2016-04-11 15:34:41 -04:00
Makefile rxrpc: Create a null security type and get rid of conditional calls 2016-04-11 15:34:41 -04:00
misc.c rxrpc: Static arrays of strings should be const char *const[] 2016-04-11 15:34:40 -04:00
rxkad.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2016-06-10 11:52:24 -07:00
sysctl.c rxrpc: Replace all unsigned with unsigned int 2016-03-13 15:14:57 -04:00