Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6

This commit is contained in:
Linus Torvalds 2006-02-01 22:06:15 -08:00
commit 59ed2f59e4
198 changed files with 8624 additions and 8435 deletions

View file

@ -179,7 +179,7 @@ extern void acpi_reserve_bootmem(void);
extern u8 x86_acpiid_to_apicid[];
#define ARCH_HAS_POWER_PDC_INIT 1
#define ARCH_HAS_POWER_INIT 1
#endif /*__KERNEL__*/