From: Olof Johansson Date: Sun, 11 May 2014 03:25:07 +0000 (-0700) Subject: Merge tag 'sunxi-fixes-for-3.15' of https://github.com/mripard/linux into fixes X-Git-Tag: accepted/tizen/common/20141203.182822~94^2~99^2~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6a7c7b007a773a846090f2577de32e7b3a3f42ab;p=platform%2Fkernel%2Flinux-arm64.git Merge tag 'sunxi-fixes-for-3.15' of https://github.com/mripard/linux into fixes Merge 'Allwinner fixes for 3.15' from Maxime Ripard: Set of fixes for the Allwinner support for 3.15 Some minor things, the major thing being the enabling of the GMAC driver in sunxi_defconfig that will un-break Olof's autobooters. * tag 'sunxi-fixes-for-3.15' of https://github.com/mripard/linux: ARM: sunxi: Enable GMAC in sunxi_defconfig ARM: sun7i: Fix i2c4 base address ARM: sun7i: fix PLL4 clock and add PLL8 Signed-off-by: Olof Johansson --- 6a7c7b007a773a846090f2577de32e7b3a3f42ab