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

author Brian Behlendorf <behlendorf1@llnl.gov>

Mon, 6 Jul 2009 20:12:34 +0000 (13:12 -0700)

committer Brian Behlendorf <behlendorf1@llnl.gov>

Mon, 6 Jul 2009 20:12:34 +0000 (13:12 -0700)
author Brian Behlendorf <behlendorf1@llnl.gov>
Mon, 6 Jul 2009 20:12:34 +0000 (13:12 -0700)
committer Brian Behlendorf <behlendorf1@llnl.gov>
Mon, 6 Jul 2009 20:12:34 +0000 (13:12 -0700)
diff --cc module/zfs/dbuf.c
Simple merge
diff --cc module/zfs/dnode_sync.c
Simple merge
diff --cc module/zfs/zfs_znode.c
Simple merge
author	Brian Behlendorf <behlendorf1@llnl.gov>
	Mon, 6 Jul 2009 20:12:34 +0000 (13:12 -0700)
committer	Brian Behlendorf <behlendorf1@llnl.gov>
	Mon, 6 Jul 2009 20:12:34 +0000 (13:12 -0700)
		1	2
module/zfs/dbuf.c	patch \|	diff1 \|	diff2 \|	blob \| history
module/zfs/dnode_sync.c	patch \|	diff1 \|	diff2 \|	blob \| history
module/zfs/zfs_znode.c	patch \|	diff1 \|	diff2 \|	blob \| history