From: Olof Johansson Date: Mon, 19 Jan 2015 19:40:14 +0000 (-0800) Subject: Merge tag 'at91-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre... X-Git-Tag: v4.0-rc1~67^2~11 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=3f0b736a9867ef160c6abd6602cce23686e2a637;p=karo-tx-linux.git Merge tag 'at91-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91 into next/defconfig Merge "at91: defconfig for 3.20 #1" from Nicolas Ferre: First batch of defconfig update for 3.20: - we remove DEBUG_LL from sama5 defconfig as all SoC are not compatible - enable ISI and selected sensors * tag 'at91-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91: ARM: at91: sama5: enable atmel-isi and ov2640 in defconfig ARM: at91/config: sama5: Remove DEBUG_LL Signed-off-by: Olof Johansson --- 3f0b736a9867ef160c6abd6602cce23686e2a637