Conflicts:

	MAINTAINERS

Thanks for breaking my tree :-)
Signed-off-by: NJames Morris <jmorris@namei.org>