Rafael J. Wysocki 0d41da2e31 Merge branch 'pm-fixes' into pm-domains ...

Merge commit e8b364b88cc4001b21c28c1ecf1e1e3ffbe162e6
(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

2011-09-26 20:12:45 +02:00

..

clock_ops.c

Merge branch 'pm-fixes' into pm-domains

2011-09-26 20:12:45 +02:00

common.c

PM: Move clock-related definitions and headers to separate file

2011-08-25 15:34:19 +02:00

domain.c

PM / Domains: Preliminary support for devices with power.irq_safe set

2011-08-25 15:37:04 +02:00

generic_ops.c

…

main.c

…

Makefile

PM: Reference counting of power.subsys_data

2011-08-25 15:34:01 +02:00

opp.c

drivers/base/power/opp.c: fix dev_opp initial value

2011-07-26 16:49:41 -07:00

power.h

…

runtime.c

PM / Runtime: Allow _put_sync() from interrupts-disabled context

2011-08-05 21:45:20 +02:00

sysfs.c

atomic: use <linux/atomic.h>

2011-07-26 16:49:47 -07:00

trace.c

…

wakeup.c

…