diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-08 17:25:58 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-08 17:25:58 (GMT) |
| commit | 7b791d445500c5674b1ef00fefc0e343ed2f85b7 (patch) | |
| tree | fcb14a27185616c694817cbc4b534c91099abb6e /include/linux/nubus.h | |
| parent | 8811930dc74a503415b35c4a79d14fb0b408a361 (diff) | |
| parent | 2e6c4e5101633a54aeee1f2e83020ee77fcb70d2 (diff) | |
| download | linux-fsl-qoriq-7b791d445500c5674b1ef00fefc0e343ed2f85b7.tar.xz | |
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:
acer-wmi, tc1100-wmi: select ACPI_WMI
ACPI: WMI: Improve Kconfig description
ACPI: DMI: add Panasonic CF-52 and Thinpad X61
ACPI: thermal: syntax, spelling, kernel-doc
intel_menlo: build on X86 only
ACPI: build WMI on X86 only
ACPI: cpufreq: Print _PPC changes via cpufreq debug layer
ACPI: add newline to printk
Diffstat (limited to 'include/linux/nubus.h')
0 files changed, 0 insertions, 0 deletions