Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

A

AndroidKernelMSM
- Activity
- Members

Snippets Groups Projects

a5b2dbcb

Commit a5b2dbcb authored 7 years ago by Erik Staats

Downloads
- Plain Diff

Merge branch 'android-msm-angler-3.10-security-next' into android-msm-angler-3.10

April 2018.1

Bug: 73498878

parents 9142a68b a9d63d6f

Branches ics-plus-aosp tools_r20

Tags android-sdk-adt_r20

No related merge requests found

Changes 15

Show whitespace changes

Inline Side-by-side

Showing

drivers/net/usb/cdc-phonet.c 2 additions, 2 deletions

drivers/net/usb/cdc-phonet.c
drivers/net/usb/cdc_ether.c 7 additions, 1 deletion

drivers/net/usb/cdc_ether.c
drivers/net/usb/qmi_wwan.c 6 additions, 1 deletion

drivers/net/usb/qmi_wwan.c
drivers/net/wireless/bcmdhd/wl_cfg80211.c 48 additions, 28 deletions

drivers/net/wireless/bcmdhd/wl_cfg80211.c
drivers/net/wireless/bcmdhd/wl_cfg80211.h 3 additions, 3 deletions

drivers/net/wireless/bcmdhd/wl_cfg80211.h
drivers/net/wireless/bcmdhd/wl_cfgvendor.c 0 additions, 37 deletions

drivers/net/wireless/bcmdhd/wl_cfgvendor.c
drivers/net/wireless/bcmdhd/wl_cfgvendor.h 0 additions, 3 deletions

drivers/net/wireless/bcmdhd/wl_cfgvendor.h
drivers/platform/msm/ipa/ipa_hdr.c 23 additions, 3 deletions

drivers/platform/msm/ipa/ipa_hdr.c
drivers/platform/msm/ipa/rmnet_ipa.c 7 additions, 0 deletions

drivers/platform/msm/ipa/rmnet_ipa.c
drivers/soc/qcom/qdsp6v2/apr.c 2 additions, 1 deletion

drivers/soc/qcom/qdsp6v2/apr.c
drivers/usb/class/cdc-acm.c 5 additions, 0 deletions

drivers/usb/class/cdc-acm.c
drivers/usb/class/cdc-wdm.c 6 additions, 1 deletion

drivers/usb/class/cdc-wdm.c
net/ipv4/raw.c 10 additions, 5 deletions

net/ipv4/raw.c
net/wireless/nl80211.c 9 additions, 1 deletion

net/wireless/nl80211.c
security/keys/encrypted-keys/encrypted.c 15 additions, 16 deletions

security/keys/encrypted-keys/encrypted.c

with 143 additions and 102 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