Merge branch 'unstable' into io

author Sage Weil <sage@newdream.net>

Mon, 7 Apr 2008 23:25:23 +0000 (16:25 -0700)

committer Sage Weil <sage@newdream.net>

Mon, 7 Apr 2008 23:25:23 +0000 (16:25 -0700)
author Sage Weil <sage@newdream.net>
Mon, 7 Apr 2008 23:25:23 +0000 (16:25 -0700)
committer Sage Weil <sage@newdream.net>
Mon, 7 Apr 2008 23:25:23 +0000 (16:25 -0700)
diff --cc src/kernel/inode.c
Simple merge
diff --cc src/kernel/mds_client.c
Simple merge
diff --cc src/kernel/super.h
Simple merge
author	Sage Weil <sage@newdream.net>
	Mon, 7 Apr 2008 23:25:23 +0000 (16:25 -0700)
committer	Sage Weil <sage@newdream.net>
	Mon, 7 Apr 2008 23:25:23 +0000 (16:25 -0700)
		1	2
src/kernel/inode.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/kernel/mds_client.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/kernel/super.h	patch \|	diff1 \|	diff2 \|	blob \| history