David S. Miller 60747ef4d1 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Minor overlapping changes for both merge conflicts. Resolution work done by Stephen Rothwell was used as a reference. Signed-off-by: David S. Miller <davem@davemloft.net>		2016-08-18 01:17:32 -04:00
..
arraymap.c	bpf: Add bpf_current_task_under_cgroup helper	2016-08-12 21:49:41 -07:00
core.c	bpf: avoid stack copy and use skb ctx for event output	2016-07-15 14:23:56 -07:00
hashtab.c	bpf: restore behavior of bpf_map_update_elem	2016-08-06 20:49:19 -04:00
helpers.c	bpf: don't use raw processor id in generic helper	2016-06-30 05:54:40 -04:00
inode.c	bpf: make inode code explicitly non-modular	2016-07-11 13:52:43 -07:00
Makefile	bpf: introduce percpu_freelist	2016-03-08 15:28:31 -05:00
percpu_freelist.c	bpf: introduce percpu_freelist	2016-03-08 15:28:31 -05:00
percpu_freelist.h	bpf: introduce percpu_freelist	2016-03-08 15:28:31 -05:00
stackmap.c	Merge branch 'linus' into perf/core, to refresh the branch	2016-06-08 09:26:46 +02:00
syscall.c	bpf: add bpf_prog_add api for bulk prog refcnt	2016-07-19 21:46:31 -07:00
verifier.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-08-18 01:17:32 -04:00