Merge branch 'misc' into release
[pandora-kernel.git] / drivers / acpi / Kconfig
Simple merge