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
..
calibrate.c	kernel: add calibration_delay_done()	2014-06-16 12:47:39 -06:00
do_mounts.c	CHROMIUM: dm: boot time specification of dm=	2016-08-18 18:56:03 +05:30
do_mounts.h	CHROMIUM: dm: boot time specification of dm=	2016-08-18 18:56:03 +05:30
do_mounts_dm.c	ANDROID: Update init/do_mounts_dm.c to the latest ChromiumOS version.	2017-05-01 15:28:17 +05:30
do_mounts_initrd.c	usermodehelper: split remaining calls to call_usermodehelper_fns()	2013-04-30 17:04:06 -07:00
do_mounts_md.c
do_mounts_rd.c	initramfs: support initramfs that is bigger than 2GiB	2014-08-08 15:57:26 -07:00
init_task.c	UPSTREAM: sched/core: Allow putting thread_info into task_struct	2017-08-11 19:31:04 +05:30
initramfs.c	ANDROID: initramfs: call free_initrd() when skipping init	2018-01-22 13:15:43 +05:30
Kconfig	Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android	2018-03-05 20:20:17 +05:30
main.c	Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android	2018-01-22 11:50:22 +05:30
Makefile	CHROMIUM: dm: boot time specification of dm=	2016-08-18 18:56:03 +05:30
noinitramfs.c	initramfs: Add skip_initramfs command line option	2016-02-16 13:54:10 -08:00
version.c	copy address of proc_ns_ops into ns_common	2014-12-04 14:34:47 -05:00