Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

A

AndroidKernelMSM
- Activity
- Members

Snippets Groups Projects

8158d574

Commit 8158d574 authored Nov 7, 2017 by Patrick Tjin

Downloads
- Plain Diff

Merge branch 'android-msm-wahoo-4.4-oc-dr1-security-next' into android-msm-wahoo-4.4-oc-dr1


January 2017.1

Bug: 68996063
Change-Id: I121739e05452a548dce491017e593e7fa837a020
Signed-off-by: Patrick Tjin <pattjin@google.com>

parents 9e3ad08c 673236d3

Branches

Tags

No related merge requests found

Changes 13

Show whitespace changes

Inline Side-by-side

Showing

arch/arm64/include/asm/esr.h 40 additions, 0 deletions

arch/arm64/include/asm/esr.h
arch/arm64/kernel/entry.S 11 additions, 1 deletion

arch/arm64/kernel/entry.S
arch/arm64/kernel/traps.c 49 additions, 0 deletions

arch/arm64/kernel/traps.c
drivers/char/adsprpc.c 4 additions, 0 deletions

drivers/char/adsprpc.c
drivers/clocksource/Kconfig 8 additions, 0 deletions

drivers/clocksource/Kconfig
drivers/clocksource/arm_arch_timer.c 9 additions, 5 deletions

drivers/clocksource/arm_arch_timer.c
drivers/input/touchscreen/synaptics_dsx_htc/synaptics_dsx_rmi_dev_htc.c 4 additions, 4 deletions

...touchscreen/synaptics_dsx_htc/synaptics_dsx_rmi_dev_htc.c
drivers/mfd/wcd9xxx-core.c 4 additions, 4 deletions

drivers/mfd/wcd9xxx-core.c
drivers/soc/qcom/spcom.c 7 additions, 3 deletions

drivers/soc/qcom/spcom.c
drivers/staging/android/ashmem.c 2 additions, 0 deletions

drivers/staging/android/ashmem.c
drivers/staging/qcacld-3.0/core/hdd/src/wlan_hdd_ioctl.c 2 additions, 2 deletions

drivers/staging/qcacld-3.0/core/hdd/src/wlan_hdd_ioctl.c
drivers/video/fbdev/msm/mdss_mdp_pp_v1_7.c 9 additions, 5 deletions

drivers/video/fbdev/msm/mdss_mdp_pp_v1_7.c
kernel/sched/fair.c 8 additions, 5 deletions

kernel/sched/fair.c

with 157 additions and 29 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment