| commit | 4e2594c4df50d7b8d9fd3defcf81082ef3b45638 | [log] [tgz] |
|---|---|---|
| author | Arnd Bergmann <arnd@arndb.de> | Wed Nov 19 14:16:16 2014 +0100 |
| committer | Arnd Bergmann <arnd@arndb.de> | Wed Nov 19 14:16:16 2014 +0100 |
| tree | 13fafb57a8b8b21f7cad245ddb0a90469bec81cc | |
| parent | fc14f9c1272f62c3e8d01300f52467c0d9af50f9 [diff] | |
| parent | 532425a7a7738b479406496ca4ad6b3247688e44 [diff] |
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 <arnd@arndb.de>