Merge branch 'acpi-scan' into acpi-pm
[pandora-kernel.git] / drivers / dma / Kconfig
Simple merge