Amit Pundir 839f249169 Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android ... Conflicts due to AOSP's backported commits: fs/f2fs/crypto.c fs/f2fs/crypto_fname.c Deleted by AOSP commit c1286ff41c2f ("f2fs: backport from (4c1fad64 - Merge tag 'for-f2fs-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs)") fs/f2fs/crypto_key.c fs/f2fs/data.c fs/f2fs/file.c AOSP commit 13f002354db1 ("f2fs: catch up to v4.14-rc1") override most of stable 4.4.y changes. Signed-off-by: Amit Pundir <amit.pundir@linaro.org>		2017-11-20 20:53:19 +05:30
..
callchain.c	treewide: Remove old email address	2015-11-23 09:44:58 +01:00
core.c	Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android	2017-11-20 20:53:19 +05:30
hw_breakpoint.c	perf: Remove type specific target pointers	2015-03-23 10:58:04 +01:00
internal.h	perf/core: Free AUX pages in unmap path	2016-06-01 15:42:47 -06:00
Makefile	ftrace: allow architectures to specify ftrace compile options	2015-01-29 09:19:19 +01:00
ring_buffer.c	perf: passing struct perf_event to function setup_aux()	2016-06-20 11:09:46 -06:00
uprobes.c	Merge remote-tracking branch 'lts/linux-4.4.y' into linux-linaro-lsk-v4.4	2016-09-20 10:17:00 +08:00