drivers/base/power/clock_ops.c · c28b56b1d46b1bbb1be33c8f2632a88b0de1ef68 · Kirill Smelkov / linux

Merge branch 'pm-fixes' into pm-domains · 0d41da2e

Rafael J. Wysocki authored Sep 26, 2011

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

0d41da2e

clock_ops.c 11.1 KB

Replace clock_ops.c