diff options
| author |   Paolo Bonzini <pbonzini@redhat.com> | 2022-06-09 09:45:00 -0400 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2022-06-09 09:45:00 -0400 |
| commit | 66da65005aa819e0b8d3a08f5ec1491b7690cb67 (patch) | |
| tree | 001471fc80938e6e13c6ecf356503d4c65043d5a /arch/arm/boot/dts/bcm953012er.dts | |
| parent | KVM: x86: do not report a vCPU as preempted outside instruction boundaries (diff) | |
| parent | MAINTAINERS: Limit KVM RISC-V entry to existing selftests (diff) | |
| download | linux-dev-66da65005aa819e0b8d3a08f5ec1491b7690cb67.tar.xz linux-dev-66da65005aa819e0b8d3a08f5ec1491b7690cb67.zip | |
Merge tag 'kvm-riscv-fixes-5.19-1' of https://github.com/kvm-riscv/linux into HEAD
KVM/riscv fixes for 5.19, take #1
- Typo fix in arch/riscv/kvm/vmid.c
- Remove broken reference pattern from MAINTAINERS entry
Diffstat (limited to 'arch/arm/boot/dts/bcm953012er.dts')
| -rw-r--r-- | arch/arm/boot/dts/bcm953012er.dts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/bcm953012er.dts b/arch/arm/boot/dts/bcm953012er.dts index 52feca0fb906..dd63a148a16b 100644 --- a/arch/arm/boot/dts/bcm953012er.dts +++ b/arch/arm/boot/dts/bcm953012er.dts @@ -37,7 +37,7 @@ / { model = "NorthStar Enterprise Router (BCM953012ER)"; - compatible = "brcm,bcm953012er", "brcm,brcm53012", "brcm,bcm4708"; + compatible = "brcm,bcm953012er", "brcm,bcm53012", "brcm,bcm4708"; memory@0 { device_type = "memory"; |