From: Brian Behlendorf <behlendorf1@llnl.gov>
Date: Fri, 20 Mar 2009 02:49:53 +0000 (-0700)
Subject: Merge branch 'fix-pthreads' into refs/top-bases/fix-branch
X-Git-Tag: zfs-0.4.4~12^2~14^2^2^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=05cec154f5ea29ccd0238ea5c58ee3c2451e4779;p=zfs

Merge branch 'fix-pthreads' into refs/top-bases/fix-branch
---

05cec154f5ea29ccd0238ea5c58ee3c2451e4779
diff --cc lib/libzpool/kernel.c
index 66ee516b3,89108fe5b..34dfc77c5
--- a/lib/libzpool/kernel.c
+++ b/lib/libzpool/kernel.c
@@@ -34,8 -34,8 +34,7 @@@
  #include <sys/stat.h>
  #include <sys/processor.h>
  #include <sys/zfs_context.h>
 -#include <sys/zmod.h>
  #include <sys/utsname.h>
- #include <sys/time.h>
  #include <sys/systeminfo.h>
  
  /*