Martin Matuska 6e767def16 Merge recent vendor changes: ... 3100 zvol rename fails with EBUSY when dirty 3104 eliminate empty bpobjs 3120 zinject hangs in zfsdev_ioctl() due to uninitialized zc References: https://www.illumos.org/issues/3100 https://www.illumos.org/issues/3104 https://www.illumos.org/issues/3120 Obtained from: illumos (vendor/illumos, vendor/illumos-sys) MFC after: 2 weeks		2012-08-28 12:25:37 +00:00
..
dtracetoolkit	Restore r211786 by rpaulo:	2012-07-05 00:52:23 +00:00
opensolaris	Merge recent vendor changes:	2012-08-28 12:25:37 +00:00