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
..
chrome	mfd: cros_ec: Add cros_ec_cmd_xfer_status() helper	2016-09-07 08:32:43 +02:00
goldfish	Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android	2017-02-27 12:00:54 +08:00
mips	MIPS: Loongson-3: Add chipset ACPI platform driver	2015-04-01 17:22:18 +02:00
olpc	OLPC: Use %*ph specifier instead of passing direct values	2015-10-06 23:22:08 +01:00
x86	platform/x86: hp-wmi: Do not shadow error values	2017-11-15 17:13:11 +01:00
Kconfig	Enable adb with android-pipe in IA image	2016-02-16 13:54:21 -08:00
Makefile	MIPS: Loongson-3: Add CPU Hwmon platform driver	2015-04-01 17:22:17 +02:00