diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2012-08-03 14:10:00 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-08-03 14:10:00 -0700 |
| commit | d8579fd834de224d2833ce2e82e0f691cc67e8f7 (patch) | |
| tree | 4427904f275fa4520faa97e76568285695a83936 /tools/perf/util/scripting-engines/trace-event-python.c | |
| parent | Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd (diff) | |
| parent | Merge branches 'delete-gts-bfs', 'misc', 'novell-bugzilla-757888-numa' and 'osc-pcie' into base (diff) | |
| download | linux-rng-d8579fd834de224d2833ce2e82e0f691cc67e8f7.tar.xz linux-rng-d8579fd834de224d2833ce2e82e0f691cc67e8f7.zip | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux
Pull ACPI and power management fixes from Len Brown:
"A 3.3 sleep regression fixed, numa bugfix, plus some minor cleanups"
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux:
ACPI processor: Fix tick_broadcast_mask online/offline regression
ACPI: Only count valid srat memory structures
ACPI: Untangle a return statement for better readability
ACPI / PCI: Do not try to acquire _OSC control if that is hopeless
ACPI: delete _GTS/_BFS support
ACPI/x86: revert 'x86, acpi: Call acpi_enter_sleep_state via an asmlinkage C function from assembler'
ACPI: replace strlen("string") with sizeof("string") -1
ACPI / PM: Fix build warning in sleep.c for CONFIG_ACPI_SLEEP unset
Diffstat (limited to 'tools/perf/util/scripting-engines/trace-event-python.c')
0 files changed, 0 insertions, 0 deletions