This resolves a merge issue with:
	drivers/misc/mei/init.c
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>