Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch

This commit is contained in:
Brian Behlendorf 2008-12-22 11:58:28 -08:00
commit 8d521165bc
1 changed files with 1 additions and 1 deletions

View File

@ -34,6 +34,7 @@
#include <sys/resource.h> #include <sys/resource.h>
#include <sys/mntent.h> #include <sys/mntent.h>
#include <sys/mkdev.h> #include <sys/mkdev.h>
#include <sys/u8_textprep.h>
#include <sys/dsl_dataset.h> #include <sys/dsl_dataset.h>
#include <sys/vfs.h> #include <sys/vfs.h>
#include <sys/vfs_opreg.h> #include <sys/vfs_opreg.h>
@ -60,7 +61,6 @@
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/zap.h> #include <sys/zap.h>
#include <sys/zfs_znode.h> #include <sys/zfs_znode.h>
#include <sys/zfs_i18n.h>
#include "zfs_prop.h" #include "zfs_prop.h"