diff options
| author | Marc Zyngier <maz@kernel.org> | 2021-08-20 11:49:23 +0100 |
|---|---|---|
| committer | Marc Zyngier <maz@kernel.org> | 2021-08-20 11:49:23 +0100 |
| commit | 6e73bc90ec447b8fcec5fd22fa49e100f3b4f909 (patch) | |
| tree | 792b10d96185da47d410539790dd5de234183d98 /drivers/net/wwan/iosm/iosm_ipc_flash.c | |
| parent | 3134cc8beb69d0db9de651081707c4651c011621 (diff) | |
| parent | 79d82cbcbb3d2a56c009ad6a6df92c5dee061dad (diff) | |
Merge branch arm64/for-next/sysreg into kvm-arm64/misc-5.15
Merge the arm64/for-next/sysreg branch to avoid merge conflicts
in -next and upstream.
* arm64/for-next/sysreg:
arm64/kexec: Test page size support with new TGRAN range values
Signed-off-by: Marc Zyngier <maz@kernel.org>
Diffstat (limited to 'drivers/net/wwan/iosm/iosm_ipc_flash.c')
0 files changed, 0 insertions, 0 deletions