Merge remote-tracking branch 'spi/for-next'

Conflicts:
	drivers/spi/spi.c

diff --cc Documentation/driver-model/devres.txt
Simple merge

diff --cc drivers/spi/spi-fsl-cpm.c
Simple merge

diff --cc drivers/spi/spi-fsl-espi.c
Simple merge

diff --cc drivers/spi/spi-mpc512x-psc.c
Simple merge

diff --cc drivers/spi/spi.c
index 740f9ddda227d55f15042e1e7a8d2cadb58aae71,8d05accf706c00fe3e0a156c8d3bde86ce47fcde..927998aa5e71e711177a3adbf7cfe94ed020a85b
--- 1/drivers/spi/spi.c
--- 2/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
@@@ -1037,10 -1145,8 +1157,10 @@@ static acpi_status acpi_spi_add_device(
                return AE_OK;
        }
  
-       strlcpy(spi->modalias, dev_name(&adev->dev), sizeof(spi->modalias));
 +      adev->power.flags.ignore_parent = true;
+       strlcpy(spi->modalias, acpi_device_hid(adev), sizeof(spi->modalias));
        if (spi_add_device(spi)) {
 +              adev->power.flags.ignore_parent = false;
                dev_err(&master->dev, "failed to add SPI device %s from ACPI\n",
                        dev_name(&adev->dev));
                spi_dev_put(spi);