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

diff --cc Makefile
index 229f5760a195ee0962a5d968f653b74821347936,83491762ebed828929df55a3f0e8d37947429e07..586907691320e33f465b12acbeb0f36b24d3d995
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -1845,7 -1855,7 +1862,8 @@@ clobber:        clea
                -o -name '*.srec' -o -name '*.bin' -o -name u-boot.img \) \
                -print0 \
                | xargs -0 rm -f
-       rm -f $(OBJS) *.bak tags
+       rm -f $(OBJS) *.bak tags TAGS include/version_autogenerated.h
++
        rm -fr *.*~
        rm -f u-boot u-boot.map u-boot.hex $(ALL)
        rm -f tools/crc32.c tools/environment.c tools/env/crc32.c