Eric Biggers ab8e3215a6 ANDROID: soc: qcom: rpmh: fix bad merge resolution ...

... between commit cd49f10d96 ("FROMLIST: soc: qcom: rpmh: Allow RPMH
driver to be loaded as a module") and upstream commit 681b091238
("soc: qcom: rpmh: Allow RPMH on ARM SoC").

Fixes: 075d0ec13d ("Merge c0842fbc1b ("random32: move the pseudo-random 32-bit definitions to prandom.h") into android-mainline")
Cc: John Stultz <john.stultz@linaro.org>
Change-Id: Ida0fefa19bba5f291218ffa794a095b41599d48e
Signed-off-by: Eric Biggers <ebiggers@google.com>

2020-08-12 09:35:13 +00:00

..

actions

treewide: Add SPDX license identifier - Makefile/Kconfig

2019-05-21 10:50:46 +02:00

amlogic

soc: amlogic: meson-gx-socinfo: Fix S905X3 and S905D3 ID's

2020-06-29 16:00:53 -07:00

aspeed

treewide: replace '---help---' in Kconfig files with 'help'

2020-06-14 01:57:21 +09:00

atmel

drivers: soc: atmel: move sam9x60 under its own config flag

2019-12-10 00:44:53 +01:00

bcm

soc: bcm: brcmstb: biuctrl: Update programming for 7211

2020-01-05 13:44:04 -08:00

dove

treewide: Add SPDX license identifier - Makefile/Kconfig

2019-05-21 10:50:46 +02:00

fsl

Merge tag 'arm-drivers-5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc

2020-06-04 19:56:20 -07:00

gemini

…

imx

Merge tag 'arm-drivers-5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc

2020-08-03 19:30:59 -07:00

ixp4xx

soc: ixp4xx: Protect IXP4xx SoC drivers by ARCH_IXP4XX || COMPILE_TEST

2019-08-29 17:34:38 +02:00

kendryte

riscv: K210: Add a built-in device tree

2020-05-18 11:38:06 -07:00

lantiq

soc: lantiq: convert to devm_platform_ioremap_resource

2020-01-10 11:44:52 -08:00

mediatek

soc: mediatek: cmdq: add set event function

2020-06-22 13:21:00 +02:00

qcom

ANDROID: soc: qcom: rpmh: fix bad merge resolution

2020-08-12 09:35:13 +00:00

renesas

soc: renesas: rcar-rst: Add support for RZ/G2H

2020-07-13 10:34:41 +02:00

rockchip

Merge tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc

2019-07-19 17:13:56 -07:00

samsung

soc: samsung: exynos-regulator-coupler: Add simple voltage coupler for Exynos5800

2020-07-22 22:33:57 +02:00

sifive

soc: sifive: l2 cache: Mark l2_get_priv_group as static

2020-05-28 15:57:49 -07:00

sunxi

treewide: Add SPDX license identifier - Makefile/Kconfig

2019-05-21 10:50:46 +02:00

tegra

soc/tegra: fuse: Fix typo in APB MISC warning

2020-07-17 15:47:35 +02:00

ti

Merge tag 'arm-drivers-5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc

2020-08-03 19:30:59 -07:00

ux500

soc: ux500: Use custom soc attribute group instead of device_create_file

2020-07-06 09:48:06 +01:00

versatile

soc: integrator: Use custom soc attribute group instead of device_create_file

2020-07-06 09:48:05 +01:00

xilinx

firmware: xilinx: Remove eemi ops for set_requirement

2020-04-28 15:45:09 +02:00

zte

treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 194

2019-05-30 11:29:22 -07:00

Kconfig

riscv: Add Kendryte K210 SoC support

2020-04-03 10:49:52 -07:00

Makefile

Merge tag 'riscv-for-linus-5.7' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux

2020-04-09 10:51:30 -07:00