Merge tag 'v3.9-rc7' into regulator-fix-core

Linux 3.9-rc7

Trivial context overlap conflicts:
	MAINTAINERS