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

2010-04-29 12:32:01 -07:00 · 2010-04-29 12:32:01 -07:00 · 98660aec20
parent 89154c98f9 aa4a91aef5
commit 98660aec20
1 changed files with 1 additions and 1 deletions
--- a/module/nvpair/nvpair_alloc_fixed.c
+++ b/module/nvpair/nvpair_alloc_fixed.c
@ -24,7 +24,7 @@
 * Use is subject to license terms.
 */

-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+

 #include <sys/stropts.h>
 #include <sys/isa_defs.h>