Merge branch 'master' of git://git.denx.de/u-boot-sunxi

diff --cc arch/arm/Kconfig
index 054ccac12bdb7ca793a87d0e08686b4d4d528dbc,3adafd6c6e28111636e2ccf326f2b59dd8783608..b2d6e80716ddd60aa0f9d26a19f9a3d53308261a
--- 1/arch/arm/Kconfig
--- 2/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -1121,10 -1321,13 +1131,9 @@@ source "board/spear/spear320/Kconfig
  source "board/spear/spear600/Kconfig"
  source "board/spear/x600/Kconfig"
  source "board/st/stv0991/Kconfig"
- source "board/sunxi/Kconfig"
  source "board/syteco/zmx25/Kconfig"
  source "board/tcl/sl50/Kconfig"
 -source "board/ti/am335x/Kconfig"
 -source "board/ti/am43xx/Kconfig"
  source "board/birdland/bav335x/Kconfig"
 -source "board/ti/ti814x/Kconfig"
 -source "board/ti/ti816x/Kconfig"
  source "board/timll/devkit3250/Kconfig"
  source "board/toradex/colibri_pxa270/Kconfig"
  source "board/technologic/ts4600/Kconfig"