diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2014-11-19 23:17:42 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2014-11-19 23:17:42 +0100 |
| commit | edb9666260928159eb532c180027b5d2e2361675 (patch) | |
| tree | 9e77fdb977d4a2eff73e4444b864d40c0ff56087 /arch/arm/mach-imx/suspend-imx6.S | |
| parent | 4fa0ff8c5b3e1300648b910c73a65b66068616d4 (diff) | |
| parent | 64bbc2bf639cd7891d6d9589ad665f1b30ee1b4a (diff) | |
Merge tag 'mvebu-defconfig-3.19' of git://git.infradead.org/linux-mvebu into next/defconfig
Pull "mvebu defconfig changes for v3.19" from Jason Cooper"
- Add options for DLink DIR665
- Add Armada 370 simple-card audio option
- Add mv88E6171 switch driver option
* tag 'mvebu-defconfig-3.19' of git://git.infradead.org/linux-mvebu:
ARM: mvebu: defconfig: Enable the mv88E6171 switch driver
ARM: mvebu: update mvebu_v7_defconfig for Armada 370 audio
ARM: config: Add DLINK DIR665 options to multi_v5_defconfig
ARM: mvebu: Add DLINK DIR665 options to mvebu_v5_defconfig
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-imx/suspend-imx6.S')
0 files changed, 0 insertions, 0 deletions