diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-30 00:44:20 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-30 00:44:20 -0400 |
| commit | 4282b01e0075ac4495ab2e1cd012cbc43e764c51 (patch) | |
| tree | 76f8776a0aee3a51490b0d0650a8baa8a5864fea /drivers/acpi/battery.c | |
| parent | 9301899be75b464ef097f0b5af7af6d9bd8f68a7 (diff) | |
| parent | aa69432a68fb0aec49551fd69fe920a6df572573 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86
* git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86:
x86 boot: document for 32 bit boot protocol
remove the dead X86_REMOTE_DEBUG option
x86: merge EARLY_PRINTK options
x86: mm/discontig_32.c: make code static
x86: kernel/setup_32.c: unexport machine_id
x86 gart: rename symbols only used for the GART implementation
x86 gart: make some variables and functions static
x86 gart: rename CONFIG_IOMMU to CONFIG_GART_IOMMU
x86 gart: rename iommu.h to gart.h
x86: additional CPUID strings; fix strings for AMD-ecx
Diffstat (limited to 'drivers/acpi/battery.c')
0 files changed, 0 insertions, 0 deletions