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

diff --cc MAINTAINERS
Simple merge

diff --cc Makefile
Simple merge

diff --cc boards.cfg
Simple merge

diff --cc include/configs/igep00x0.h
Simple merge

diff --cc include/configs/omap4_common.h
Simple merge

diff --cc include/configs/sc_sps_1.h
index f807a61c73d2fc6027147ecb6a096e406420e0a2,21c76b52743a08d083375a42c520cd01a1c2517e..decf8d9dec855aeef9408cc1905c0ed91be90bcb
--- 1/include/configs/sc_sps_1.h
--- 2/include/configs/sc_sps_1.h
+++ b/include/configs/sc_sps_1.h
@@@ -158,8 -158,8 +158,7 @@@
  #ifdef CONFIG_CMD_NET
  #define CONFIG_ETHPRIME                       "FEC0"
  #define CONFIG_FEC_MXC
- #define CONFIG_FEC_MXC_MULTI
  #define CONFIG_MII
 -#define CONFIG_DISCOVER_PHY
  #define CONFIG_FEC_XCV_TYPE           RMII
  #define CONFIG_PHYLIB
  #define CONFIG_PHY_SMSC