svn commit: r268124 - head/sys/cddl/contrib/opensolaris

[Xin LI]

Author: delphij
Date: Tue Jul  1 21:57:15 2014
New Revision: 268124
URL: http://svnweb.freebsd.org/changeset/base/268124

Log:
  Mark r268120 as merged.  We believe that the LZ4 usage in ZFS is not
  affected and plans to sync with upstream LZ4 in the near future.

Modified:
Directory Properties:
  head/sys/cddl/contrib/opensolaris/   (props changed)