Mark Brown 0b37fbf750 Merge branch 'experimental/android-3.10' of https://android.googlesource.com/kernel/common into linux-linaro-lsk-android ... Conflicts: arch/arm/include/asm/smp.h arch/arm/kernel/smp.c kernel/futex.c		2013-07-19 10:42:11 +01:00
..
events	Merge branch 'experimental/android-3.10' of https://android.googlesource.com/kernel/common into linux-linaro-lsk-android	2013-07-19 10:42:11 +01:00
define_trace.h
ftrace.h	tracing: Remove obsolete macro guard _TRACE_PROFILE_INIT	2013-04-12 23:02:33 -04:00
syscall.h