Merge branch 'u-boot-sunxi/master' into 'u-boot-arm/master'

diff --cc boards.cfg
Simple merge

diff --cc drivers/gpio/Makefile
Simple merge

diff --cc drivers/i2c/Makefile
index 96bd45d85396493c160b8e94686f6507282e3cde,61e9f3c2400e0ad4e8823407d5eb5a1bf08a7e1a..416ea4f2c838df32766b1cf267a2f061f2a54aab
--- 1/drivers/i2c/Makefile
--- 2/drivers/i2c/Makefile
+++ b/drivers/i2c/Makefile
@@@ -18,8 -17,8 +17,9 @@@ obj-$(CONFIG_SYS_I2C) += i2c_core.
  obj-$(CONFIG_SYS_I2C_DAVINCI) += davinci_i2c.o
  obj-$(CONFIG_SYS_I2C_FSL) += fsl_i2c.o
  obj-$(CONFIG_SYS_I2C_FTI2C010) += fti2c010.o
 +obj-$(CONFIG_SYS_I2C_IHS) += ihs_i2c.o
  obj-$(CONFIG_SYS_I2C_KONA) += kona_i2c.o
+ obj-$(CONFIG_SYS_I2C_MVTWSI) += mvtwsi.o
  obj-$(CONFIG_SYS_I2C_MXC) += mxc_i2c.o
  obj-$(CONFIG_SYS_I2C_OMAP24XX) += omap24xx_i2c.o
  obj-$(CONFIG_SYS_I2C_OMAP34XX) += omap24xx_i2c.o