Commit Graph

5 Commits

Author SHA1 Message Date
Brian Behlendorf 13ba3d23f3 Merge commit 'refs/top-bases/linux-user-util' into linux-user-util
Conflicts:
	lib/libzfs/libzfs_sendrecv.c
2010-05-28 21:42:14 -07:00
Brian Behlendorf 428870ff73 Update core ZFS code from build 121 to build 141. 2010-05-28 13:45:14 -07:00
Brian Behlendorf 868e5de066 Add linux-user-util topic branch.
This topic branch contains required changes to the user space
utilities to allow them to integrate cleanly with Linux.
2010-05-21 10:47:59 -07:00
Brian Behlendorf 9babb37438 Rebase master to b117 2009-07-02 15:44:48 -07:00
Brian Behlendorf 172bb4bd5e Move the world out of /zfs/ and seperate out module build tree 2008-12-11 11:08:09 -08:00