Merge branch 'master' of git://www.denx.de/git/u-boot into new-image

diff --cc Makefile
index adfef9bbc0914a40c63eaa9731ff3a79a6b4dbd9,90198f6583c2713ade6224d6cbdaa3bbbed34c3e..c56518fb9e5a5b7c018be1f18d7fff2a767aadf2
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -2922,15 -2870,11 +2870,13 @@@ clobber:     clea
                -o -name '*.srec' -o -name '*.bin' -o -name u-boot.img \) \
                -print0 \
                | xargs -0 rm -f
-       @rm -f $(OBJS) $(obj)*.bak $(obj)ctags $(obj)etags $(obj)TAGS
-       @rm -fr $(obj)*.*~
+       @rm -f $(OBJS) $(obj)*.bak $(obj)ctags $(obj)etags $(obj)TAGS \
+               $(obj)cscope.* $(obj)*.*~
        @rm -f $(obj)u-boot $(obj)u-boot.map $(obj)u-boot.hex $(ALL)
-       @rm -f $(obj)tools/crc32.c $(obj)tools/environment.c $(obj)tools/env/crc32.c
-       @rm -f $(obj)tools/sha1.c $(obj)tools/image.c
-       @rm -f $(obj)tools/fdt.c $(obj)tools/fdt_ro.c $(obj)tools/fdt_rw.c
-       @rm -f $(obj)tools/fdt_strerror.c $(obj)tools/fdt_wip.c
-       @rm -f $(obj)tools/libfdt_internal.h
-       @rm -f $(obj)tools/inca-swap-bytes $(obj)cpu/mpc824x/bedbug_603e.c
+       @rm -f $(obj)tools/{crc32.c,environment.c,env/crc32.c,sha1.c,inca-swap-bytes}
++      @rm -f $(obj)tools/{image.c,fdt.c,fdt_ro.c,fdt_rw.c,fdt_strerror.c}
++      @rm -f $(obj)tools/{fdt_wip.c,libfdt_internal.h}
+       @rm -f $(obj)cpu/mpc824x/bedbug_603e.c
        @rm -f $(obj)include/asm/proc $(obj)include/asm/arch $(obj)include/asm
        @[ ! -d $(obj)nand_spl ] || find $(obj)nand_spl -lname "*" -print | xargs rm -f
        @[ ! -d $(obj)onenand_ipl ] || find $(obj)onenand_ipl -lname "*" -print | xargs rm -f