Merge branch 'remoteproc-next' into remoteproc-3.6-merge-test

Conflicts:
	drivers/remoteproc/remoteproc_core.c