Merge remote branch 'eris/stats'

[zfs] / .gitignore

diff --git a/.gitignore b/.gitignore
index 3cbbc0f9879012ea2dce31e4a623881999638e2c..453a553dd8771007c318abb7217eb907fa39d97f 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -39,6 +39,7 @@ Makefile.in
 /config.status
 /libtool
 /zfs_config.h
+/zfs_config.h.in
 /zfs.spec
 /zfs-modules.spec
 /zfs.release