From: Markus Klotzbücher <mk@pollux.(none)>
Date: Fri, 24 Feb 2006 10:34:34 +0000 (+0100)
Subject: Merge branch 'master' of http://www.denx.de/git/u-boot
X-Git-Tag: LABEL_2006_03_12_0025~28
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=7d4d1ce48c849ec5a7e034fd4bc4d0e624075e7b;p=oweals%2Fu-boot.git

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

7d4d1ce48c849ec5a7e034fd4bc4d0e624075e7b
diff --cc Makefile
index 229f5760a1,83491762eb..5869076913
--- a/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