diff options
author | 2010-03-07 15:45:35 -0800 | |
---|---|---|
committer | 2010-03-07 15:45:35 -0800 | |
commit | 5980bb3ee6e733d66eea04c221a140dea15d52de (patch) | |
tree | 5365854f6fc7db6cc2d6a5cfc605942058c7a76a /tools/perf/util/scripting-engines/trace-event-python.c | |
parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost (diff) | |
parent | PM: Provide generic subsystem-level callbacks (diff) | |
download | linux-dev-5980bb3ee6e733d66eea04c221a140dea15d52de.tar.xz linux-dev-5980bb3ee6e733d66eea04c221a140dea15d52de.zip |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6:
PM: Provide generic subsystem-level callbacks
PM / Runtime: Document power.runtime_auto and related functions
Diffstat (limited to 'tools/perf/util/scripting-engines/trace-event-python.c')
0 files changed, 0 insertions, 0 deletions