Skip to content
Commit e9293d92 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'mvebu-defconfig-4.5-2' of git://git.infradead.org/linux-mvebu into next/defconfig

Merge "mvebu defconfig for 4.5 (part 2)" from Gregory CLEMENT:

- Reenable DSA in mvebu_v5_defconfig
- Update multi_v5_defconfig after adding Orion5x to multiarch

* tag 'mvebu-defconfig-4.5-2' of git://git.infradead.org/linux-mvebu:
  ARM: mvebu: update v5 defconfig for Orion5x machines
  ARM: mvebu: Reenable DSA in mvebu_v5_defconfig
  ARM: config: Add orion5x to multi_v5_defconfig
  ARM: config: Reenable DSA in multi_v5_defconfig
  ARM: config: Regenerate multi_v5_defconfig
parents 1741c735 ab8d80eb
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment