Jiri Kosina 4b7bd36470 Merge branch 'master' into for-next ... Conflicts: MAINTAINERS arch/arm/mach-omap2/pm24xx.c drivers/scsi/bfa/bfa_fcpim.c Needed to update to apply fixes for which the old branch was too outdated.		2010-12-22 18:57:02 +01:00
..
generic_ops.c	PM / Runtime: Lenient generic runtime pm callbacks	2010-10-17 01:57:41 +02:00
main.c	Merge branch 'master' into for-next	2010-12-22 18:57:02 +01:00
Makefile	PM: Introduce library for device-specific OPPs (v7)	2010-10-17 01:57:50 +02:00
opp.c	PM: Introduce library for device-specific OPPs (v7)	2010-10-17 01:57:50 +02:00
power.h	PM / Runtime: Add no_callbacks flag	2010-10-17 01:57:47 +02:00
runtime.c	PM / Runtime: Fix typo in status comparison causing warning	2010-10-29 15:29:55 +02:00
sysfs.c	PM / Runtime: Implement autosuspend support	2010-10-17 01:57:48 +02:00
trace.c	PM: Add sysfs attr for rechecking dev hash from PM trace	2010-10-17 01:57:50 +02:00
wakeup.c	PM / Wakeup: Show wakeup sources statistics in debugfs	2010-10-19 23:42:49 +02:00