-
- Downloads
Merge branch 'android-msm-marlin-3.18-oc-mr1' into android-msm-marlin-3.18
Conflicts: include/crypto/internal/hash.h security/keys/request_key.c June 2018.1 Bug: 76445910 Change-Id: Ib5ff8dc1d4fa848f2d0e6f69831804b3fe915a5a
Showing
- arch/arm64/configs/marlin_defconfig 0 additions, 1 deletionarch/arm64/configs/marlin_defconfig
- drivers/char/adsprpc.c 107 additions, 12 deletionsdrivers/char/adsprpc.c
- drivers/char/diag/diag_dci.c 72 additions, 27 deletionsdrivers/char/diag/diag_dci.c
- drivers/gpu/msm/kgsl.c 15 additions, 19 deletionsdrivers/gpu/msm/kgsl.c
- drivers/media/platform/msm/camera_v2/isp/msm_isp40.c 3 additions, 0 deletionsdrivers/media/platform/msm/camera_v2/isp/msm_isp40.c
- drivers/media/platform/msm/camera_v2/isp/msm_isp44.c 3 additions, 0 deletionsdrivers/media/platform/msm/camera_v2/isp/msm_isp44.c
- drivers/media/platform/msm/camera_v2/isp/msm_isp46.c 3 additions, 1 deletiondrivers/media/platform/msm/camera_v2/isp/msm_isp46.c
- drivers/media/platform/msm/camera_v2/isp/msm_isp47.c 3 additions, 1 deletiondrivers/media/platform/msm/camera_v2/isp/msm_isp47.c
- drivers/media/platform/msm/camera_v2/isp/msm_isp_axi_util.c 2 additions, 0 deletionsdrivers/media/platform/msm/camera_v2/isp/msm_isp_axi_util.c
- drivers/media/platform/msm/camera_v2/isp/msm_isp_util.c 6 additions, 0 deletionsdrivers/media/platform/msm/camera_v2/isp/msm_isp_util.c
- drivers/staging/qcacld-2.0/CORE/CLD_TXRX/TXRX/ol_tx_send.c 4 additions, 1 deletiondrivers/staging/qcacld-2.0/CORE/CLD_TXRX/TXRX/ol_tx_send.c
- drivers/staging/qcacld-2.0/CORE/EPPING/src/epping_main.c 0 additions, 3 deletionsdrivers/staging/qcacld-2.0/CORE/EPPING/src/epping_main.c
- drivers/staging/qcacld-2.0/CORE/HDD/inc/wlan_hdd_cfg80211.h 3 additions, 7 deletionsdrivers/staging/qcacld-2.0/CORE/HDD/inc/wlan_hdd_cfg80211.h
- drivers/staging/qcacld-2.0/CORE/HDD/inc/wlan_hdd_main.h 0 additions, 9 deletionsdrivers/staging/qcacld-2.0/CORE/HDD/inc/wlan_hdd_main.h
- drivers/staging/qcacld-2.0/CORE/HDD/inc/wlan_hdd_memdump.h 1 addition, 59 deletionsdrivers/staging/qcacld-2.0/CORE/HDD/inc/wlan_hdd_memdump.h
- drivers/staging/qcacld-2.0/CORE/HDD/src/wlan_hdd_cfg80211.c 0 additions, 20 deletionsdrivers/staging/qcacld-2.0/CORE/HDD/src/wlan_hdd_cfg80211.c
- drivers/staging/qcacld-2.0/CORE/HDD/src/wlan_hdd_main.c 3 additions, 19 deletionsdrivers/staging/qcacld-2.0/CORE/HDD/src/wlan_hdd_main.c
- drivers/staging/qcacld-2.0/CORE/HDD/src/wlan_hdd_memdump.c 19 additions, 615 deletionsdrivers/staging/qcacld-2.0/CORE/HDD/src/wlan_hdd_memdump.c
- drivers/staging/qcacld-2.0/CORE/MAC/inc/sirApi.h 0 additions, 55 deletionsdrivers/staging/qcacld-2.0/CORE/MAC/inc/sirApi.h
- drivers/staging/qcacld-2.0/CORE/MAC/inc/wniApi.h 0 additions, 1 deletiondrivers/staging/qcacld-2.0/CORE/MAC/inc/wniApi.h
Loading
Please register or sign in to comment