Merge git://www.denx.de/git/u-boot

diff --cc Makefile
Simple merge

diff --cc drivers/net/Makefile
index 7342dc8,37d69b9..0639859
--- 1/drivers/net/Makefile
--- 2/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@@ -23,9 -23,9 +23,8 @@@
  
  include $(TOPDIR)/config.mk
  
- LIB   := $(obj)libnetdrv.a
- 
- COBJS         := xilinx_emaclite.o xilinx_emac.o
+ LIB   := $(obj)libnet.a
 -
 -COBJS         := mcffec.o
++COBJS         := mcffec.o xilinx_emac.o xilinx_emaclite.o
  
  SRCS  := $(COBJS:.o=.c)
  OBJS  := $(addprefix $(obj),$(COBJS))