diff options
| author | Brian Behlendorf <[email protected]> | 2018-05-29 14:57:07 -0700 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2018-05-29 14:57:55 -0700 |
| commit | 1272941f49321bcb7b26025670720c98785427ee (patch) | |
| tree | 068d78ae84d1fdaf25c392f48799789e7f63d1dc /module/zfs/txg.c | |
| parent | 3e5300e0ed3c4b49e3b0dab7daded1e3bfaaded7 (diff) | |
| parent | a91258913fb597db7f409f3534512cf2249bceb6 (diff) | |
Merge branch 'zfsonlinux/merge-spl'
Merge a minimal version of the zfsonlinux/spl repository in to the
zfsonlinux/zfs repository. Care was taken to prevent file conflicts
when merging and to preserve the spl repository history. The spl
kernel module remains under the GPLv2 license as documented by the
additional THIRDPARTYLICENSE.gplv2 file.
Signed-off-by: Brian Behlendorf <[email protected]>
Diffstat (limited to 'module/zfs/txg.c')
0 files changed, 0 insertions, 0 deletions