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

diff --cc Makefile
Simple merge

diff --cc board/cds/mpc8541cds/Makefile
Simple merge

diff --cc board/cds/mpc8548cds/Makefile
Simple merge

diff --cc board/cds/mpc8555cds/Makefile
Simple merge

diff --cc board/stxxtc/Makefile
index 2951b96,b575e23..424ab1c
--- 1/board/stxxtc/Makefile
--- 2/board/stxxtc/Makefile
+++ b/board/stxxtc/Makefile
@@@ -32,8 -32,16 +32,8 @@@ OBJS := $(addprefix $(obj),$(COBJS)
  SOBJS := $(addprefix $(obj),$(SOBJS))
  
  $(LIB):       $(obj).depend $(OBJS)
-       $(AR) crv $@ $(OBJS)
+       $(AR) $(ARFLAGS) $@ $(OBJS)
  
 -$(obj)%.dtb: $(src)%.dts
 -      dtc -f -V 0x10 -I dts -O dtb $< >$@
 -
 -$(obj)%.c: $(obj)%.dtb
 -      xxd -i $< \
 -         | sed -e "s/^unsigned char/const unsigned char/g" \
 -         | sed -e "s/^unsigned int/const unsigned int/g" > $@
 -
  #########################################################################
  
  # defines $(obj).depend target

diff --cc common/Makefile
Simple merge

diff --cc common/cmd_bootm.c
Simple merge

diff --cc common/ft_build.c
Simple merge

diff --cc drivers/Makefile
Simple merge

diff --cc include/common.h
Simple merge

diff --cc include/image.h
Simple merge

diff --cc tools/mkimage.c
Simple merge