Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch

This commit is contained in:
Brian Behlendorf 2010-03-08 10:51:47 -08:00
parent 5f863d5936 6ce79a427a
commit ed3451bd03
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
module/zfs/zfs_ioctl.c
View File

@ -3867,7 +3867,7 @@ _fini(void)
spl_module_init(_init); spl_module_init(_init);
spl_module_exit(_fini); spl_module_exit(_fini);
MODULE_AUTHOR("Sun Microsystems, Inc");
MODULE_DESCRIPTION("ZFS"); MODULE_DESCRIPTION("ZFS");
MODULE_LICENSE("CDDL"); MODULE_AUTHOR(ZFS_META_AUTHOR);
MODULE_LICENSE(ZFS_META_LICENSE);
#endif /* HAVE_SPL */ #endif /* HAVE_SPL */