Merge branch 'pm-fixes' into pm-domains

Merge commit e8b364b8
(PM / Clocks: Do not acquire a mutex under a spinlock) fixing
a regression in drivers/base/power/clock_ops.c.

Conflicts:
	drivers/base/power/clock_ops.c