From: Olof Johansson Date: Wed, 15 Oct 2014 06:30:18 +0000 (-0700) Subject: Merge tag 'fixes-for-v3.18-merge-window' of git://git.kernel.org/pub/scm/linux/kernel... X-Git-Tag: v3.18-rc1~1^2~6 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=6d81dc87c0fac76efabcde6884fcbe4cec874a83;p=karo-tx-linux.git Merge tag 'fixes-for-v3.18-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes Merge "Two omap fixes for v3.18 merge window" from Tony Lindgren: Two omap fixes for issues noticed during the merge window: - We need to enable ARM errata 430973 for omap3 - The smc91x on some early n900 boards need to be disabled for now until the dependencies to specific a bootloader version are fixed * tag 'fixes-for-v3.18-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: dts: Disable smc91x on n900 until bootloader dependency is removed ARM: omap2plus_defconfig: Enable ARM erratum 430973 for omap3 Signed-off-by: Olof Johansson --- 6d81dc87c0fac76efabcde6884fcbe4cec874a83