diff options
author | 2010-06-27 07:41:04 -0700 | |
---|---|---|
committer | 2010-06-27 07:41:04 -0700 | |
commit | dee70a32fa90cd05a5e34d03a48d549473569101 (patch) | |
tree | 1aab213cb310996fd2f0a324ef5b0c61d3d2e0e6 /tools/perf/util/scripting-engines/trace-event-python.c | |
parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 (diff) | |
parent | PCI/PM: Do not use native PCIe PME by default (diff) | |
download | linux-dev-dee70a32fa90cd05a5e34d03a48d549473569101.tar.xz linux-dev-dee70a32fa90cd05a5e34d03a48d549473569101.zip |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:
PCI/PM: Do not use native PCIe PME by default
Diffstat (limited to 'tools/perf/util/scripting-engines/trace-event-python.c')
0 files changed, 0 insertions, 0 deletions