Merge tag 'sunxi-fixes-for-3.15' of https://github.com/mripard/linux into fixes
authorOlof Johansson <olof@lixom.net>
Sun, 11 May 2014 03:25:07 +0000 (20:25 -0700)
committerOlof Johansson <olof@lixom.net>
Sun, 11 May 2014 03:25:07 +0000 (20:25 -0700)
commit6a7c7b007a773a846090f2577de32e7b3a3f42ab
treef9f389cbd5336baac80484f92dab48ec26e2dcda
parente5e49fe9dfe33beabd0af593870cc9247ba481a6
parent84e108fc7b23310fb6d93a657e47181d64ab6e93
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 <olof@lixom.net>