Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch

Browse Source

Conflicts:

	lib/libzfs/libzfs_pool.c

...

This commit is contained in:

Brian Behlendorf 2009-07-06 15:06:49 -07:00

parent 55a2d87100 409cfe5051

commit 7edabe59cf

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available