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
..
2017-04-03 09:46:33 -07:00
2017-04-07 12:27:45 -07:00
2017-04-07 12:27:45 -07:00
2017-02-28 17:10:49 -08:00
2017-03-22 00:23:24 -07:00
2017-04-07 12:27:45 -07:00
2017-04-07 12:27:45 -07:00
2017-04-07 12:27:45 -07:00
2017-03-12 06:37:29 +01:00
2017-04-07 12:27:45 -07:00
2017-04-07 12:27:45 -07:00
2017-03-24 01:37:04 -07:00
2017-03-15 09:57:14 +08:00
2017-04-07 12:27:45 -07:00
2017-04-07 12:27:45 -07:00