diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2011-05-17 23:23:46 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rjw@sisk.pl> | 2011-05-17 23:23:46 +0200 |
| commit | 290c748725c170ed9a02522959ae67f528eefe98 (patch) | |
| tree | a920190b75c7e054af24d850e79cc54f5cf53263 /drivers/atm/zeprom.h | |
| parent | 2d2a9163bd4f3ba301f8138c32e4790edc30156c (diff) | |
| parent | 72874daa5e9064c4e8d689e6a04b1e96f687f872 (diff) | |
Merge branch 'power-domains' into for-linus
* power-domains:
PM: Fix build issue in clock_ops.c for CONFIG_PM_RUNTIME unset
PM: Revert "driver core: platform_bus: allow runtime override of dev_pm_ops"
OMAP1 / PM: Use generic clock manipulation routines for runtime PM
PM / Runtime: Generic clock manipulation rountines for runtime PM (v6)
PM / Runtime: Add subsystem data field to struct dev_pm_info
OMAP2+ / PM: move runtime PM implementation to use device power domains
PM / Platform: Use generic runtime PM callbacks directly
shmobile: Use power domains for platform runtime PM
PM: Export platform bus type's default PM callbacks
PM: Make power domain callbacks take precedence over subsystem ones
Diffstat (limited to 'drivers/atm/zeprom.h')
0 files changed, 0 insertions, 0 deletions