Merge branch 'dev'
Conflicts:
ChangeLog
Signed-off-by: Jon Masters <jcm@jonmasters.org>
diff --git a/ChangeLog b/ChangeLog
index 4ff8d00..e099089 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+3.16 Version:
+o build: missed a top-level cached copy of modprobe.d.5 which broke builds
+
3.15 Version:
o build: properly fix man page creation symlink handling
o doc: remove invalid multiple output files from docbook markup
diff --git a/configure.ac b/configure.ac
index 339e4c9..b085178 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(module-init-tools,3.15)
+AC_INIT(module-init-tools,3.16)
AC_CANONICAL_SYSTEM
diff --git a/modprobe.d.5 b/modprobe.d.5
deleted file mode 100644
index d0ed026..0000000
--- a/modprobe.d.5
+++ /dev/null
@@ -1 +0,0 @@
-.so modprobe.conf.5
