diff options
author | 2010-02-18 08:13:39 -0800 | |
---|---|---|
committer | 2010-02-18 08:13:39 -0800 | |
commit | 2fa298cf6d6bedf64f75644e9e8b0d64d2d83f27 (patch) | |
tree | bd04abc0761ee1bfdf4baa0471d4fc5e6c3aa121 /tools/perf/util/scripting-engines/trace-event-python.c | |
parent | Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 (diff) | |
parent | Merge branches 'bugzilla-14886', 'bugzilla-15000', 'bugzilla-15040', 'bugzilla-15108', 'pdc', 'hotplug-null-ref' and 'thinkpad' into release (diff) | |
download | wireguard-linux-2fa298cf6d6bedf64f75644e9e8b0d64d2d83f27.tar.xz wireguard-linux-2fa298cf6d6bedf64f75644e9e8b0d64d2d83f27.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: fix "acpi=ht" boot option
ACPI, i915: blacklist Clevo M5x0N bad_lid state
ACPI: fix High cpu temperature with 2.6.32
ACPI: dock: properly initialize local struct dock_station in dock_add()
ACPI: remove Asus P2B-DS from acpi=ht blacklist
thinkpad-acpi: wrong thermal attribute_group removed in thermal_exit()
ACPI: acpi_bus_{scan,bus,add}: return -ENODEV if no device was found
ACPI: Add NULL pointer check in acpi_bus_start
ACPI: processor: only evaluate _PDC once per processor
ACPI: processor: add kernel command line support for early _PDC eval
Diffstat (limited to 'tools/perf/util/scripting-engines/trace-event-python.c')
0 files changed, 0 insertions, 0 deletions