From: Arnd Bergmann Date: Wed, 19 Nov 2014 13:16:16 +0000 (+0100) Subject: Merge tag 'sunxi-fixes-for-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git... X-Git-Tag: v3.18-rc6~4^2~5 X-Git-Url: https://git.kernelconcepts.de/?a=commitdiff_plain;h=4e2594c4df50d7b8d9fd3defcf81082ef3b45638;p=karo-tx-linux.git Merge tag 'sunxi-fixes-for-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux into fixes Merge "Allwinner fixes for 3.18" from Maxime Ripard: A fix for the A31 dma controller that requires the AHB clock to be parented to PLL6 in order to operate. * tag 'sunxi-fixes-for-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux: ARM: dts: sun6i: Re-parent ahb1_mux to pll6 as required by dma controller Signed-off-by: Arnd Bergmann --- 4e2594c4df50d7b8d9fd3defcf81082ef3b45638