Merge commit 'refs/top-bases/fix-dbuf_dirty_record_t' into fix-dbuf_dirty_record_t

author Brian Behlendorf <behlendorf1@llnl.gov>

Wed, 3 Dec 2008 20:49:26 +0000 (12:49 -0800)

committer Brian Behlendorf <behlendorf1@llnl.gov>

Wed, 3 Dec 2008 20:49:26 +0000 (12:49 -0800)
author Brian Behlendorf <behlendorf1@llnl.gov>
Wed, 3 Dec 2008 20:49:26 +0000 (12:49 -0800)
committer Brian Behlendorf <behlendorf1@llnl.gov>
Wed, 3 Dec 2008 20:49:26 +0000 (12:49 -0800)
diff --cc zfs/lib/libzpool/dbuf.c
Simple merge
diff --cc zfs/lib/libzpool/dnode_sync.c
Simple merge
diff --cc zfs/lib/libzpool/zfs_znode.c
Simple merge
author	Brian Behlendorf <behlendorf1@llnl.gov>
	Wed, 3 Dec 2008 20:49:26 +0000 (12:49 -0800)
committer	Brian Behlendorf <behlendorf1@llnl.gov>
	Wed, 3 Dec 2008 20:49:26 +0000 (12:49 -0800)
		1	2
zfs/lib/libzpool/dbuf.c	patch \|	diff1 \|	diff2 \|	blob \| history
zfs/lib/libzpool/dnode_sync.c	patch \|	diff1 \|	diff2 \|	blob \| history
zfs/lib/libzpool/zfs_znode.c	patch \|	diff1 \|	diff2 \|	blob \| history