Merge master.kernel.org:/pub/scm/linux/kernel/git/lenb/linux-2.6
[powerpc.git] / arch / i386 / pci / acpi.c
2005-04-16 Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2