Amit Pundir 24740dab5c Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android ... Signed-off-by: Amit Pundir <amit.pundir@linaro.org> Conflicts: fs/f2fs/extent_cache.c Pick changes from AOSP Change-Id: Icd8a85ac0c19a8aa25cd2591a12b4e9b85bdf1c5 ("f2fs: catch up to v4.14-rc1") fs/f2fs/namei.c Pick changes from AOSP F2FS backport commit 7d5c08fd91 ("f2fs: backport from (4c1fad64 - Merge tag 'for-f2fs-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs)")		2018-03-05 20:20:17 +05:30
..
.gitignore	kbuild: trivial - remove trailing empty lines	2014-06-10 00:04:06 +02:00
devicetable-offsets.c	sound updates for 4.4-rc1	2015-11-06 11:04:07 -08:00
empty.c
file2alias.c	of: fix autoloading due to broken modalias with no 'compatible'	2016-07-27 09:47:28 -07:00
Makefile	UPSTREAM: kbuild: Consolidate header generation from ASM offset information	2017-11-20 21:15:59 +05:30
mk_elfconfig.c	kbuild: trivial - remove trailing empty lines	2014-06-10 00:04:06 +02:00
modpost.c	module/retpoline: Warn about missing retpoline in module	2018-02-25 11:03:52 +01:00
modpost.h	Avoid conflict with host definitions when cross-compiling	2015-08-20 14:55:54 +02:00
sumversion.c	kbuild: trivial - use tabs for code indent where possible	2014-06-10 14:00:53 +02:00