| #
0b42f15a |
| 02-Oct-2013 |
Simon Klinkert <klinkert@webgods.de> |
Merge remote-tracking branch 'illumos-ml/master' into titanic
Some zev merge conflicts fixed.
Conflicts:
usr/src/uts/common/fs/zfs/zfs_ioctl.c
usr/src/uts/common/fs/zfs/zvol.c
|
| #
494f7e12 |
| 18-Jul-2013 |
Keith M Wesolowski <wesolows@foobazco.org> |
3915 Add adjuncts support to the build
Reviewed by: Robert Mustacchi <rm@joyent.com>
Reviewed by: Richard Lowe <richlowe@richlowe.net>
Approved by: Dan McDonald <danmcd@nexenta.com>
|
| #
06d2b6d4 |
| 09-Sep-2009 |
Wyllys Ingersoll <wyllys.ingersoll@sun.com> |
6879451 lint warning from sun4v tpm build
6879982 tpm frees mutex object twice and can cause panic
|
| #
8d26100c |
| 20-Aug-2009 |
Wyllys Ingersoll <wyllys.ingersoll@sun.com> |
6855414 Deliver SPARC support for TPM
6865428 pkcs11_tpm should be installed by default, or it won't be used
|