Merge remote-tracking branch 'linusw/ib-rockchip' into irq/generic_handle_domain_irq
authorMarc Zyngier <maz@kernel.org>
Wed, 18 Aug 2021 19:38:01 +0000 (20:38 +0100)
committerMarc Zyngier <maz@kernel.org>
Wed, 18 Aug 2021 19:38:01 +0000 (20:38 +0100)
commit6ecd53f49fad3dc2de2f34a035ffb06bd1972fde
treeef95a2f5e6bec47a602ddb75ce7fe2e6ae943361
parenteecb06813d7381dbee98034983e9db64bfb3a131
parent9ce9a02039de72ec8af1bd4bff14f1780337ffcc
Merge remote-tracking branch 'linusw/ib-rockchip' into irq/generic_handle_domain_irq

Merge Linus' ib-rockchip branch to avoid ugly conflicts
with the generic_handle_domain_irq rework.

Signed-off-by: Marc Zyngier <maz@kernel.org>