Merge branch 'android-msm-marlin-3.18-nyc-mr2' into android-msm-marlin-3.18-oc
November 2017.1
Bug: 65558892
Change-Id: I416cc8f5064539eeb8d39234c009a549aca5945d
Signed-off-by: 
Andrew Lehmer <alehmer@google.com>
Showing
- drivers/char/diag/diag_masks.c 42 additions, 17 deletionsdrivers/char/diag/diag_masks.c
- drivers/char/diag/diagchar.h 3 additions, 0 deletionsdrivers/char/diag/diagchar.h
- drivers/char/diag/diagchar_core.c 2 additions, 0 deletionsdrivers/char/diag/diagchar_core.c
- drivers/char/diag/diagfwd.c 34 additions, 10 deletionsdrivers/char/diag/diagfwd.c
- drivers/char/diag/diagfwd_cntl.c 9 additions, 5 deletionsdrivers/char/diag/diagfwd_cntl.c
- drivers/gpu/msm/adreno_debugfs.c 7 additions, 1 deletiondrivers/gpu/msm/adreno_debugfs.c
- drivers/gpu/msm/kgsl_cmdbatch.c 40 additions, 4 deletionsdrivers/gpu/msm/kgsl_cmdbatch.c
- drivers/gpu/msm/kgsl_cmdbatch.h 3 additions, 1 deletiondrivers/gpu/msm/kgsl_cmdbatch.h
- drivers/input/misc/keychord.c 3 additions, 1 deletiondrivers/input/misc/keychord.c
- drivers/media/platform/msm/camera_v2/isp/msm_isp_axi_util.c 9 additions, 1 deletiondrivers/media/platform/msm/camera_v2/isp/msm_isp_axi_util.c
- drivers/media/platform/msm/camera_v2/isp/msm_isp_stats_util.c 6 additions, 0 deletions...ers/media/platform/msm/camera_v2/isp/msm_isp_stats_util.c
- drivers/media/platform/msm/camera_v2/msm.c 5 additions, 0 deletionsdrivers/media/platform/msm/camera_v2/msm.c
- drivers/media/platform/msm/camera_v2/pproc/cpp/msm_cpp.c 12 additions, 7 deletionsdrivers/media/platform/msm/camera_v2/pproc/cpp/msm_cpp.c
- drivers/media/platform/msm/camera_v2/sensor/io/msm_camera_cci_i2c.c 4 additions, 2 deletions...dia/platform/msm/camera_v2/sensor/io/msm_camera_cci_i2c.c
- drivers/media/platform/msm/camera_v2/sensor/msm_sensor_driver.c 15 additions, 8 deletions...s/media/platform/msm/camera_v2/sensor/msm_sensor_driver.c
- drivers/misc/qcom/qdsp6v2/audio_hwacc_effects.c 34 additions, 0 deletionsdrivers/misc/qcom/qdsp6v2/audio_hwacc_effects.c
- drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c 5 additions, 0 deletionsdrivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
- drivers/staging/qcacld-2.0/CORE/HDD/src/wlan_hdd_wext.c 4 additions, 0 deletionsdrivers/staging/qcacld-2.0/CORE/HDD/src/wlan_hdd_wext.c
- drivers/staging/qcacld-2.0/CORE/MAC/inc/sirMacProtDef.h 1 addition, 1 deletiondrivers/staging/qcacld-2.0/CORE/MAC/inc/sirMacProtDef.h
- drivers/staging/qcacld-2.0/CORE/MAC/src/include/dot11f.h 2 additions, 3 deletionsdrivers/staging/qcacld-2.0/CORE/MAC/src/include/dot11f.h
Loading
Please register or sign in to comment