Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk

This commit is contained in:
Brian Behlendorf 2010-05-21 16:48:21 -07:00
commit 524a2ac202
1 changed files with 1 additions and 1 deletions

View File

@ -11,7 +11,7 @@ SUBDIRS = $(USER_DIR) $(KERNEL_DIR)
AUTOMAKE_OPTIONS = foreign dist-zip AUTOMAKE_OPTIONS = foreign dist-zip
EXTRA_DIST = autogen.sh config/config.awk EXTRA_DIST = autogen.sh config/config.awk
EXTRA_DIST += zfs.spec.in zfs-modules.spec.in EXTRA_DIST += zfs.spec.in zfs-modules.spec.in
EXTRA_DIST += META DISCLAIMER GIT EXTRA_DIST += META DISCLAIMER COPYRIGHT GIT
EXTRA_DIST += OPENSOLARIS.LICENSE ZFS.RELEASE EXTRA_DIST += OPENSOLARIS.LICENSE ZFS.RELEASE
noinst_HEADERS = zfs_config.h noinst_HEADERS = zfs_config.h