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

diff --git a/tools/.gitignore b/tools/.gitignore
index 979f2da..df3500d 100644 (file)
--- a/tools/.gitignore
+++ b/tools/.gitignore
@@ -15,3 +15,4 @@
 /fdt_strerror.c
 /fdt_wip.c
 /libfdt_internal.h
+/zlib.h