Thierry Strudel
1bfb0526f6
Merge branch 'android-msm-8998-4.4-common' into android-msm-wahoo-4.4
Conflicts:
Makefile
arch/arm64/configs/wahoo_defconfig
arch/arm64/include/asm/cpufeature.h
arch/arm64/kernel/sleep.S
arch/arm64/kernel/vmlinux.lds.S
arch/arm64/mm/fault.c
drivers/android/binder.c
drivers/firmware/efi/arm-init.c
drivers/firmware/efi/efi.c
drivers/input/keyboard/gpio_keys.c
drivers/input/misc/Makefile
drivers/input/misc/vl53L0/Makefile
drivers/input/misc/vl53L0/inc/vl53l010_api.h
drivers/input/misc/vl53L0/inc/vl53l010_device.h
drivers/input/misc/vl53L0/inc/vl53l010_strings.h
drivers/input/misc/vl53L0/inc/vl53l010_tuning.h
drivers/input/misc/vl53L0/inc/vl53l0_api.h
drivers/input/misc/vl53L0/inc/vl53l0_api_calibration.h
drivers/input/misc/vl53L0/inc/vl53l0_api_core.h
drivers/input/misc/vl53L0/inc/vl53l0_api_histogram.h
drivers/input/misc/vl53L0/inc/vl53l0_api_ranging.h
drivers/input/misc/vl53L0/inc/vl53l0_api_strings.h
drivers/input/misc/vl53L0/inc/vl53l0_def.h
drivers/input/misc/vl53L0/inc/vl53l0_device.h
drivers/input/misc/vl53L0/inc/vl53l0_interrupt_threshold_settings.h
drivers/input/misc/vl53L0/inc/vl53l0_platform.h
drivers/input/misc/vl53L0/inc/vl53l0_platform_log.h
drivers/input/misc/vl53L0/inc/vl53l0_tuning.h
drivers/input/misc/vl53L0/inc/vl53l0_types.h
drivers/input/misc/vl53L0/src/vl53l010_api.c
drivers/input/misc/vl53L0/src/vl53l010_tuning.c
drivers/input/misc/vl53L0/src/vl53l0_api.c
drivers/input/misc/vl53L0/src/vl53l0_api_calibration.c
drivers/input/misc/vl53L0/src/vl53l0_api_core.c
drivers/input/misc/vl53L0/src/vl53l0_api_histogram.c
drivers/input/misc/vl53L0/src/vl53l0_api_ranging.c
drivers/input/misc/vl53L0/src/vl53l0_api_strings.c
drivers/input/misc/vl53L0/src/vl53l0_i2c_platform.c
drivers/input/misc/vl53L0/src/vl53l0_platform.c
drivers/input/misc/vl53L0/src/vl53l0_port_i2c.c
drivers/input/misc/vl53L0/stmvl53l0-cci.h
drivers/input/misc/vl53L0/stmvl53l0-i2c.h
drivers/input/misc/vl53L0/stmvl53l0.h
drivers/input/misc/vl53L0/stmvl53l0_module-cci.c
drivers/input/misc/vl53L0/stmvl53l0_module-i2c.c
drivers/input/misc/vl53L0/stmvl53l0_module.c
drivers/input/touchscreen/Makefile
drivers/leds/leds-qpnp.c
drivers/media/platform/msm/camera_v2/isp/msm_isp_stats_util.c
drivers/media/platform/msm/camera_v2/msm.c
drivers/pinctrl/qcom/pinctrl-msm.c
drivers/platform/msm/ipa/ipa_v3/ipa_client.c
drivers/platform/msm/mhi/mhi_ssr.c
drivers/power/supply/qcom/qpnp-smb2.c
drivers/power/supply/qcom/smb-lib.c
drivers/power/supply/qcom/smb-lib.h
drivers/soc/qcom/icnss.c
drivers/soc/qcom/qdsp6v2/audio_notifier.c
drivers/soc/qcom/service-notifier.c
drivers/video/fbdev/msm/mdss_panel.h
fs/exec.c
fs/ext4/inode.c
fs/ext4/readpage.c
fs/namei.c
fs/sdcardfs/derived_perm.c
fs/sdcardfs/file.c
fs/sdcardfs/inode.c
fs/sdcardfs/lookup.c
fs/sdcardfs/main.c
fs/sdcardfs/multiuser.h
fs/sdcardfs/packagelist.c
fs/sdcardfs/sdcardfs.h
fs/sdcardfs/super.c
fs/utimes.c
include/linux/string.h
lib/kstrtox.c
lib/string.c
net/ipv4/tcp_ipv4.c
net/unix/af_unix.c
sound/soc/codecs/wcd934x/wcd934x-mbhc.h
sound/soc/msm/msm8998.c
Change-Id: I918ebad22a5f81d48be07bd2bc2ac435ed9acb0a
Signed-off-by: Thierry Strudel <tstrudel@google.com>
2017-04-07 12:27:45 -07:00
..
2016-04-12 09:09:00 -07:00
2015-02-11 17:06:03 -08:00
2015-06-23 13:35:49 +09:00
2015-07-27 14:06:24 +02:00
2015-11-03 17:22:17 -08:00
2015-09-23 09:54:28 +02:00
2014-01-17 17:01:46 -05:00
2014-01-17 17:01:46 -05:00
2015-08-03 10:59:30 +02:00
2014-04-18 11:40:30 +02:00
2012-10-04 18:20:15 +01:00
2014-04-07 16:36:10 -07:00
2013-02-11 20:00:33 +05:30
2014-09-25 18:00:45 -07:00
2014-04-09 13:44:35 -07:00
2015-10-15 00:21:13 +02:00
2014-10-03 05:46:55 +02:00
2016-03-03 15:07:16 -08:00
2013-01-27 19:23:27 +01:00
2011-07-22 18:45:33 +02:00
2014-05-20 16:55:23 -06:00
2014-09-22 13:35:51 +02:00
2012-12-25 20:14:54 +01:00
2016-03-22 11:11:56 -07:00
2015-09-08 17:52:23 -07:00
2012-03-28 18:30:03 +01:00
2016-08-30 21:29:09 -07:00
2016-08-30 21:29:09 -07:00
2012-02-24 10:39:27 -08:00
2015-05-12 10:46:53 +02:00
2016-03-22 11:09:36 -07:00
2013-10-02 20:02:35 -04:00
2012-10-04 18:20:15 +01:00
2015-10-16 12:08:53 +02:00
2015-10-16 12:08:53 +02:00
2015-07-21 10:47:03 +02:00
2014-06-06 16:08:13 -07:00
2015-06-07 15:28:56 +02:00
2014-09-13 18:38:07 +02:00
2012-10-02 18:01:56 +01:00
2012-07-24 15:27:30 +08:00
2013-06-05 13:21:29 +03:00
2011-07-26 16:49:47 -07:00
2011-07-26 16:49:47 -07:00
2014-02-09 21:18:52 +01:00
2015-09-19 03:58:10 -04:00
2014-11-19 11:54:13 +01:00
2015-07-17 16:39:53 -07:00
2014-11-22 21:52:08 +01:00
2012-12-09 23:14:14 +01:00
2012-09-28 14:31:03 +09:30
2014-11-23 13:01:47 +01:00
2015-10-06 17:28:20 +02:00
2013-06-26 12:10:55 +02:00
2015-10-06 17:28:20 +02:00
2012-01-10 17:39:40 -08:00
2012-10-04 18:20:15 +01:00
2013-01-03 15:57:16 -08:00
2015-08-25 09:59:45 +02:00
2012-04-30 15:21:02 -06:00
2015-11-10 16:32:11 -08:00
2015-06-08 07:56:21 -05:00
2014-06-17 19:12:40 -04:00
2015-11-04 11:31:31 -08:00
2016-07-26 16:34:38 -07:00
2015-09-18 09:27:29 +02:00
2015-08-12 11:59:06 +02:00
2015-05-08 12:36:48 +02:00
2016-07-27 09:47:29 -07:00
2014-05-15 00:32:09 +01:00
2015-09-05 13:19:09 +02:00
2015-10-06 17:28:24 +02:00
2015-04-17 09:04:09 -04:00
2014-10-09 22:26:04 -04:00
2016-06-01 12:15:54 -07:00
2012-11-29 00:01:23 -05:00
2013-09-24 06:02:24 +10:00
2012-06-28 17:14:34 +01:00
2012-10-04 18:20:15 +01:00
2012-03-28 18:30:03 +01:00
2014-09-23 16:20:00 -04:00
2013-02-14 09:21:15 -05:00
2012-10-04 18:20:15 +01:00
2015-11-23 09:44:58 +01:00
2012-03-04 17:54:34 -05:00
2012-11-13 15:48:27 -05:00
2016-09-24 10:07:45 +02:00
2014-05-08 10:22:23 +02:00
2013-05-05 10:58:06 -07:00
2017-04-07 12:27:45 -07:00
2013-09-30 14:31:02 -07:00
2015-07-08 16:41:55 -04:00
2012-10-03 21:21:06 +02:00