Orangefs: merge to v4.5

author Mike Marshall <[email protected]>

Mon, 14 Mar 2016 19:39:42 +0000 (15:39 -0400)

committer Mike Marshall <[email protected]>

Mon, 14 Mar 2016 19:39:42 +0000 (15:39 -0400)
author Mike Marshall <[email protected]>
Mon, 14 Mar 2016 19:39:42 +0000 (15:39 -0400)
committer Mike Marshall <[email protected]>
Mon, 14 Mar 2016 19:39:42 +0000 (15:39 -0400)
diff --cc MAINTAINERS
Simple merge
diff --cc fs/Kconfig
Simple merge
author	Mike Marshall <[email protected]>
	Mon, 14 Mar 2016 19:39:42 +0000 (15:39 -0400)
committer	Mike Marshall <[email protected]>
	Mon, 14 Mar 2016 19:39:42 +0000 (15:39 -0400)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
fs/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history