diff options
author | 2011-07-17 12:47:47 -0700 | |
---|---|---|
committer | 2011-07-17 12:47:47 -0700 | |
commit | a6b52a9db891e2a39e8a0fed6005935d8b1aa59c (patch) | |
tree | 3fbef9df274667d1e96894c2b8c373b7192cfaf1 /tools/perf/scripts/python/syscall-counts.py | |
parent | Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6 (diff) | |
parent | Merge branches 'd3cold', 'bugzilla-37412' and 'bugzilla-38152' into release (diff) | |
download | linux-dev-a6b52a9db891e2a39e8a0fed6005935d8b1aa59c.tar.xz linux-dev-a6b52a9db891e2a39e8a0fed6005935d8b1aa59c.zip |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6:
ACPI: Fixes device power states array overflow
ACPI, APEI, HEST, Detect duplicated hardware error source ID
ACPI: Fix lockdep false positives in acpi_power_off()
Diffstat (limited to 'tools/perf/scripts/python/syscall-counts.py')
0 files changed, 0 insertions, 0 deletions