Merge commit 'adb420b2' into head
Signed-off-by:
Gopal G Goberu <ggober@codeaurora.org>
Change-Id: If7f2a33ea7dde7348f7de67a47557c4212371a61
Conflicts:
drivers/input/misc/akm8963.c
drivers/input/misc/mpu6050.c
drivers/media/platform/msm/vidc/msm_vidc_common.c
Loading
Please register or sign in to comment