From: Arnd Bergmann Date: Fri, 5 Sep 2014 20:29:46 +0000 (+0200) Subject: Merge tag 'at91-defconfig' of git://github.com/at91linux/linux-at91 into next/defconfig X-Git-Tag: v3.18-rc1~117^2~11 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=85ff58a3be610ca567a78c5d4e45ddd2e89088db;p=linux.git Merge tag 'at91-defconfig' of git://github.com/at91linux/linux-at91 into next/defconfig Pull "First batch of AT91 defconfig update for 3.18" from Nicolas Ferre: - a dependency needed for SPI flash - enable sound on DT platforms - cleanup of current defconfigs: - addition of new PWM subsystem and related drivers - addition of ADC/touchscreen, watchdog or USB depending on the SoC - addition of power/reset drivers activated during this development cycle - removal of obsolete config options Signed-off-by: Arnd Bergmann * tag 'at91-defconfig' of git://github.com/at91linux/linux-at91: ARM: at91: sama5: update defconfig ARM: at91: at91sam9rl: update defconfig ARM: at91: at91sam9g45: update defconfig ARM: at91: at91sam9263: update defconfig ARM: at91: at91sam9261_9g10: update defconfig ARM: at91: at91sam9260_9g20: update defconfig ARM: at91: at91_dt: update defconfig ARM: at91/sama5_defconfig: enable sound support ARM: at91/at91_dt_defconfig: enable sound support ARM: at91: add MTD_SPI_NOR (new dependency for M25P80) --- 85ff58a3be610ca567a78c5d4e45ddd2e89088db