Merge 4.13-rc7 into char-misc-next

author Greg Kroah-Hartman <[email protected]>

Mon, 28 Aug 2017 08:19:01 +0000 (10:19 +0200)

committer Greg Kroah-Hartman <[email protected]>

Mon, 28 Aug 2017 08:19:01 +0000 (10:19 +0200)
author Greg Kroah-Hartman <[email protected]>
Mon, 28 Aug 2017 08:19:01 +0000 (10:19 +0200)
committer Greg Kroah-Hartman <[email protected]>
Mon, 28 Aug 2017 08:19:01 +0000 (10:19 +0200)
diff --cc MAINTAINERS
Simple merge
diff --cc include/linux/fs.h
Simple merge
author	Greg Kroah-Hartman <[email protected]>
	Mon, 28 Aug 2017 08:19:01 +0000 (10:19 +0200)
committer	Greg Kroah-Hartman <[email protected]>
	Mon, 28 Aug 2017 08:19:01 +0000 (10:19 +0200)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
include/linux/fs.h	patch \|	diff1 \|	diff2 \|	blob \| history