Merge branch 'testing' of github.com:ceph/ceph-client into v3.8-rc5-testing

author Alex Elder <[email protected]>

Wed, 30 Jan 2013 13:54:34 +0000 (07:54 -0600)

committer Alex Elder <[email protected]>

Wed, 30 Jan 2013 13:54:34 +0000 (07:54 -0600)
author Alex Elder <[email protected]>
Wed, 30 Jan 2013 13:54:34 +0000 (07:54 -0600)
committer Alex Elder <[email protected]>
Wed, 30 Jan 2013 13:54:34 +0000 (07:54 -0600)
diff --cc fs/ceph/file.c
Simple merge
diff --cc include/linux/ceph/decode.h
Simple merge
diff --cc include/linux/ceph/osdmap.h
Simple merge
author	Alex Elder <[email protected]>
	Wed, 30 Jan 2013 13:54:34 +0000 (07:54 -0600)
committer	Alex Elder <[email protected]>
	Wed, 30 Jan 2013 13:54:34 +0000 (07:54 -0600)
		1	2
fs/ceph/file.c	patch \|	diff1 \|	diff2 \|	blob \| history
include/linux/ceph/decode.h	patch \|	diff1 \|	diff2 \|	blob \| history
include/linux/ceph/osdmap.h	patch \|	diff1 \|	diff2 \|	blob \| history