From: Olof Johansson <olof@lixom.net>
Date: Sat, 22 Feb 2014 00:36:21 +0000 (-0800)
Subject: Merge tag 'mvebu-defconfig-3.15' of git://git.infradead.org/linux-mvebu into next... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=b9de5332bf4a2177a42304647f9534f717cfaa6f;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

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

Merge "mvebu defconfig changes for v3.15" from Jason Cooper:

 - dove
    - remove UBI support
    - enable watchdog

 - mvebu
    - rename mvebu_defconfig mvebu_v7_defconfig
    - enable audio
    - enable watchdog
    - add Armada 375 and 38x

* tag 'mvebu-defconfig-3.15' of git://git.infradead.org/linux-mvebu:
  ARM: mvebu: update defconfigs for Armada 375 and 38x
  ARM: dove: Enable watchdog support in the defconfig
  ARM: mvebu: Enable watchdog support in defconfig
  ARM: mvebu: enable audio options in mvebu_defconfig
  ARM: mvebu: rename mvebu_defconfig to mvebu_v7_defconfig
  ARM: dove: Remove UBI support from defconfig

Signed-off-by: Olof Johansson <olof@lixom.net>
---

b9de5332bf4a2177a42304647f9534f717cfaa6f