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
..
arraymap.c	bpf: fix allocation warnings in bpf maps and integer overflow	2015-12-02 23:36:00 -05:00
core.c	bpf: consolidate bpf_prog_put{, _rcu} dismantle paths	2015-11-02 22:48:39 -05:00
hashtab.c	bpf: fix allocation warnings in bpf maps and integer overflow	2015-12-02 23:36:00 -05:00
helpers.c	bpf: avoid copying junk bytes in bpf_get_current_comm()	2016-04-20 15:42:01 +09:00
inode.c	bpf, inode: disallow userns mounts	2016-06-24 10:18:17 -07:00
Makefile	bpf: add support for persistent maps/progs	2015-11-02 22:48:39 -05:00
syscall.c	bpf: fix refcnt overflow	2016-05-18 17:06:37 -07:00
verifier.c	Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android	2017-11-20 20:53:19 +05:30