From: Arnd Bergmann <arnd@arndb.de>
Date: Tue, 15 Dec 2015 16:44:49 +0000 (+0100)
Subject: Merge tag 'mvebu-defconfig-4.5-2' of git://git.infradead.org/linux-mvebu into next... 
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=e9293d92bef1b0ff84c3c3b387727d5cdcfa8a71;p=deliverable%2Flinux.git

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
---

e9293d92bef1b0ff84c3c3b387727d5cdcfa8a71