Joerg Roedel a20cc76b9e Merge branches 'arm/renesas', 'arm/smmu', 'arm/omap', 'ppc/pamu', 'x86/amd' and 'core' into next ... Conflicts: drivers/iommu/Kconfig drivers/iommu/Makefile		2015-02-04 16:53:44 +01:00
..
events	Merge branches 'arm/renesas', 'arm/smmu', 'arm/omap', 'ppc/pamu', 'x86/amd' and 'core' into next	2015-02-04 16:53:44 +01:00
define_trace.h	tracing: Add DEFINE_EVENT_FN() macro	2013-06-20 22:24:32 -07:00
ftrace.h	tracing: Fix return value of ftrace_raw_output_prep()	2014-11-19 15:25:48 -05:00
syscall.h	tracing: Fix syscall_*regfunc() vs copy_process() race	2014-06-21 00:15:12 -04:00