diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-05 00:03:00 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-05 00:03:00 +0200 |
| commit | 5e5027bd26ed4df735d29e66cd5c1c9b5959a587 (patch) | |
| tree | 9b98ea464691aa865864033d52e2d123451fbf86 /tools/perf/builtin-annotate.c | |
| parent | Merge branch 'sfi-release' of git://git.kernel.org/pub/scm/linux/kernel/git/l... (diff) | |
| parent | acpi_pad: build only on X86 (diff) | |
| download | linux-5e5027bd26ed4df735d29e66cd5c1c9b5959a587.tar.xz linux-5e5027bd26ed4df735d29e66cd5c1c9b5959a587.zip | |
Merge branch 'acpi-pad' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6
* 'acpi-pad' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6:
acpi_pad: build only on X86
ACPI: create Processor Aggregator Device driver
Fixup trivial conflicts in MAINTAINERS file.
Diffstat (limited to 'tools/perf/builtin-annotate.c')
0 files changed, 0 insertions, 0 deletions