David S. Miller dc25b25897 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/usb/qmi_wwan.c Overlapping additions of new device IDs to qmi_wwan.c Signed-off-by: David S. Miller <davem@davemloft.net>		2015-08-21 11:44:04 -07:00
..
callchain.c	Merge branch 'for-3.18-consistent-ops' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu	2014-10-15 07:48:18 +02:00
core.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-08-21 11:44:04 -07:00
hw_breakpoint.c	perf: Remove type specific target pointers	2015-03-23 10:58:04 +01:00
internal.h	perf: Fix AUX buffer refcounting	2015-07-06 14:08:30 +02:00
Makefile	ftrace: allow architectures to specify ftrace compile options	2015-01-29 09:19:19 +01:00
ring_buffer.c	perf: Fix double-free of the AUX buffer	2015-08-12 11:37:21 +02:00
uprobes.c	Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux	2014-12-15 15:52:01 -08:00