Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Skip to content
Commit 3e8eac83 authored by Blagovest Kolenichev's avatar Blagovest Kolenichev
Browse files

Merge android11-5.4.61+ (54e6ca5c) into msm-5.4



* refs/heads/tmp-54e6ca5c:
  ANDROID: ABI: Update allowed list for EXYNOS
  ANDROID: GKI: add abi_gki_aarch64_oneplus
  ANDROID: GKI: prevent removal of monitored symbols
  ANDROID: ABI: Update allowed list for QCOM
  ANDROID: ABI: Update allowed list for EXYNOS
  ANDROID: GKI: add abi_gki_aarch64_galaxy
  UPSTREAM: module: Correctly truncate sysfs sections output
  Revert "ANDROID: Revert "module: Do not expose section addresses to non-CAP_SYSLOG""
  Revert "ANDROID: Revert "module: Refactor section attr into bin attribute""
  Revert "ANDROID: vendor_hooks: Add vendor hooks for key combination"
  Revert "ANDROID: fix i386 build break"
  ANDROID: fix i386 build break
  ANDROID: vendor_hooks: Add vendor hooks for key combination
  ANDROID: ABI: Update allowed list for QCOM
  FROMLIST: power: supply: core: property to control reverse charge
  FROMLIST: power: supply: core: add wireless signal strength property
  FROMLIST: power: supply: core: add wireless charger adapter type property
  FROMLIST: power: supply: core: add quick charge type property

Conflicts:
	android/abi_gki_aarch64_qcom

Change-Id: I97977300f5ba7dfb546835a94637b25b551edcbf
Signed-off-by: default avatarBlagovest Kolenichev <bkolenichev@codeaurora.org>
parents 4b9bef81 54e6ca5c
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment