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

Conflicts:
	net/ipv4/ip_gre.c

Minor conflicts between tunnel bug fixes in net and
ipv6 tunnel cleanups in net-next.

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

2016-05-04 00:52:29 -04:00

..

callchain.c

perf: generalize perf_callchain

2016-02-20 00:21:44 -05:00

core.c

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

2016-05-04 00:52:29 -04:00

hw_breakpoint.c

perf: Collapse and fix event_function_call() users

2016-01-21 18:54:24 +01:00

internal.h

perf: generalize perf_callchain

2016-02-20 00:21:44 -05:00

Makefile

ftrace: allow architectures to specify ftrace compile options

2015-01-29 09:19:19 +01:00

ring_buffer.c

perf/core: Fix Undefined behaviour in rb_alloc()

2016-03-21 09:08:18 +01:00

uprobes.c

mm, fs: get rid of PAGE_CACHE_* and page_cache_{get,release} macros

2016-04-04 10:41:08 -07:00