diff options
author | Rafael J. Wysocki <rjw@sisk.pl> | 2011-10-07 23:16:55 +0200 |
---|---|---|
committer | Rafael J. Wysocki <rjw@sisk.pl> | 2011-10-07 23:16:55 +0200 |
commit | d727b60659a1173eb4142a5fc521ce67c28b34e1 (patch) | |
tree | 793d0fc86ecf98331024db5c86bc271cc72aa2d2 /kernel/printk.c | |
parent | Merge git://github.com/davem330/net (diff) | |
parent | PM / Tracing: build rpm-traces.c only if CONFIG_PM_RUNTIME is set (diff) | |
download | linux-d727b60659a1173eb4142a5fc521ce67c28b34e1.tar.xz linux-d727b60659a1173eb4142a5fc521ce67c28b34e1.zip |
Merge branch 'pm-runtime' into pm-for-linus
* pm-runtime:
PM / Tracing: build rpm-traces.c only if CONFIG_PM_RUNTIME is set
PM / Runtime: Replace dev_dbg() with trace_rpm_*()
PM / Runtime: Introduce trace points for tracing rpm_* functions
PM / Runtime: Don't run callbacks under lock for power.irq_safe set
USB: Add wakeup info to debugging messages
PM / Runtime: pm_runtime_idle() can be called in atomic context
PM / Runtime: Add macro to test for runtime PM events
PM / Runtime: Add might_sleep() to runtime PM functions
Diffstat (limited to 'kernel/printk.c')
0 files changed, 0 insertions, 0 deletions