Merge tag 'nios2-fixes-v3.19-rc3' of git://git.rocketboards.org/linux-socfpga-next
[pandora-kernel.git] / drivers / acpi / Kconfig
Simple merge