diff options
author | Olof Johansson <olof@lixom.net> | 2014-02-21 16:36:21 -0800 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2014-02-21 16:36:21 -0800 |
commit | b9de5332bf4a2177a42304647f9534f717cfaa6f (patch) | |
tree | 598c2e7e4c052da98c42cfbc3bafb2e715a97ce7 /arch/hexagon/mm | |
parent | b392b489fe218337904beff00a776fb2bc77a0d6 (diff) | |
parent | dd1d03afe8a0825d718f5d74225ad57978599a89 (diff) |
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>
Diffstat (limited to 'arch/hexagon/mm')
0 files changed, 0 insertions, 0 deletions