diff options
| author | Brian Behlendorf <[email protected]> | 2016-10-04 11:20:38 -0700 |
|---|---|---|
| committer | GitHub <[email protected]> | 2016-10-04 11:20:38 -0700 |
| commit | 5cc78dc81232bc474d25ccfcacb42d80d83c5310 (patch) | |
| tree | 7dfaccfc85d5e687a7334450f3dbf16865bf3995 /Makefile.am | |
| parent | 0c313d2f7451041e9cc952fe68fb500efef52fe1 (diff) | |
| parent | 7d75815dc950bdce3fd03cc40a3352d93c270e0f (diff) | |
Merge OpenZFS 4185
OpenZFS 4185 - add new cryptographic checksums to ZFS: SHA-512, Skein, Edon-R
Reviewed-by: Chunwei Chen <[email protected]>
Reviewed-by: Tom Caputi <[email protected]>
Reviewed-by: David Quigley <[email protected]>
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Tony Hutter <[email protected]>
Closes #4760
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index fe4285b3f..abc98e4ed 100644 --- a/Makefile.am +++ b/Makefile.am @@ -6,7 +6,7 @@ include config/tgz.am SUBDIRS = include rpm if CONFIG_USER -SUBDIRS += udev etc man scripts tests lib cmd contrib +SUBDIRS += udev etc man scripts lib tests cmd contrib endif if CONFIG_KERNEL SUBDIRS += module |