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

Conflicts: lib/libzpool/include/sys/zfs_context.h
2010-05-28 22:21:07 -07:00 · 2010-05-28 22:21:07 -07:00 · 61f5fa262e
parent 2d6e5286eb e776fc7fa7
commit 61f5fa262e
1 changed files with 0 additions and 1 deletions
--- a/lib/libzpool/include/sys/zfs_context.h
+++ b/lib/libzpool/include/sys/zfs_context.h
@ -110,7 +110,6 @@ extern void vpanic(const char *, __va_list);

 #define	fm_panic	panic

-
 /*
 * DTrace SDT probes have different signatures in userland than they do in
 * kernel.  If they're being used in kernel code, re-define them out of