diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2016-02-09 12:44:25 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2016-02-09 12:44:25 +0000 |
| commit | b3fd9b18977148b2e9e64a11e4667e7511c03dde (patch) | |
| tree | 0f920259d964e8eb6e531b0ab40793e0758103f0 /usr/src/grub | |
| parent | 8443e038ef8eb3ca6a95818d6e90b2a1eb4e9cb6 (diff) | |
| parent | d7e7cb9c207e40874f6a4b61ca8ea1526b5555bd (diff) | |
| download | illumos-joyent-b3fd9b18977148b2e9e64a11e4667e7511c03dde.tar.gz | |
[illumos-gate merge]
commit d7e7cb9c207e40874f6a4b61ca8ea1526b5555bd
6528 need casesensitivity/normalization test cases for zfs-tests
commit c3d26abc9ee97b4f60233556aadeb57e0bd30bb9
5027 zfs large block support (add copyright)
Diffstat (limited to 'usr/src/grub')
| -rw-r--r-- | usr/src/grub/grub-0.97/stage2/fsys_zfs.c | 1 | ||||
| -rw-r--r-- | usr/src/grub/grub-0.97/stage2/zfs-include/spa.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/usr/src/grub/grub-0.97/stage2/fsys_zfs.c b/usr/src/grub/grub-0.97/stage2/fsys_zfs.c index f9bc6fda49..5c3cf6c786 100644 --- a/usr/src/grub/grub-0.97/stage2/fsys_zfs.c +++ b/usr/src/grub/grub-0.97/stage2/fsys_zfs.c @@ -25,6 +25,7 @@ /* * Copyright (c) 2012, 2015 by Delphix. All rights reserved. * Copyright (c) 2013 by Saso Kiselkov. All rights reserved. + * Copyright (c) 2014 Integros [integros.com] */ /* diff --git a/usr/src/grub/grub-0.97/stage2/zfs-include/spa.h b/usr/src/grub/grub-0.97/stage2/zfs-include/spa.h index deb52cfda3..822f67c923 100644 --- a/usr/src/grub/grub-0.97/stage2/zfs-include/spa.h +++ b/usr/src/grub/grub-0.97/stage2/zfs-include/spa.h @@ -24,6 +24,7 @@ /* * Copyright (c) 2013 by Delphix. All rights reserved. + * Copyright (c) 2014 Integros [integros.com] */ #ifndef _SYS_SPA_H |