diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2012-04-06 19:56:04 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-04-06 19:56:04 -0700 |
| commit | f21fec96ead90eae7bcb3c847e8115c119c5dc62 (patch) | |
| tree | d60a74cc16aab57f5c8a4a496f0c6e9f33848d45 /tools/perf/util/scripting-engines/trace-event-python.c | |
| parent | Merge branch '3.4-rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending (diff) | |
| parent | Merge branches 'idle-fix' and 'misc' into release (diff) | |
| download | wireguard-linux-f21fec96ead90eae7bcb3c847e8115c119c5dc62.tar.xz wireguard-linux-f21fec96ead90eae7bcb3c847e8115c119c5dc62.zip | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux
Pull ACPI & Power Management patches from Len Brown:
"Two fixes for cpuidle merge-window changes, plus a URL fix in
MAINTAINERS"
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux:
MAINTAINERS: Update git url for ACPI
cpuidle: Fix panic in CPU off-lining with no idle driver
ACPI processor: Use safe_halt() rather than halt() in acpi_idle_play_dead()
Diffstat (limited to 'tools/perf/util/scripting-engines/trace-event-python.c')
0 files changed, 0 insertions, 0 deletions