Merge branch 'devel-stable' of git://git.armlinux.org.uk/~rmk/linux-arm into char...

This merges from linux-arm at 860660fd829e ("ARM: 9055/1: mailbox:
arm_mhuv2: make remove callback return void") into char-misc-next to get
the amba fixes from Uwe.

Cc: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Cc: Russell King <linux@armlinux.org.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --cc drivers/hwtracing/coresight/coresight-catu.c
Simple merge

diff --cc drivers/hwtracing/coresight/coresight-cti-core.c
Simple merge

diff --cc drivers/hwtracing/coresight/coresight-etb10.c
Simple merge

diff --cc drivers/hwtracing/coresight/coresight-etm3x-core.c
Simple merge

diff --cc drivers/hwtracing/coresight/coresight-etm4x-core.c
index 5017d33,82787cb..bc55b26
--- 1/drivers/hwtracing/coresight/coresight-etm4x-core.c
--- 2/drivers/hwtracing/coresight/coresight-etm4x-core.c
+++ b/drivers/hwtracing/coresight/coresight-etm4x-core.c
@@@ -1906,30 -1703,8 +1906,28 @@@ static int __exit etm4_remove_dev(struc
        cpus_read_unlock();
  
        coresight_unregister(drvdata->csdev);
- 
-       return 0;
  }
  
 +static int __exit etm4_remove_amba(struct amba_device *adev)
 +{
 +      struct etmv4_drvdata *drvdata = dev_get_drvdata(&adev->dev);
 +
 +      if (drvdata)
 +              return etm4_remove_dev(drvdata);
 +      return 0;
 +}
 +
 +static int __exit etm4_remove_platform_dev(struct platform_device *pdev)
 +{
 +      int ret = 0;
 +      struct etmv4_drvdata *drvdata = dev_get_drvdata(&pdev->dev);
 +
 +      if (drvdata)
 +              ret = etm4_remove_dev(drvdata);
 +      pm_runtime_disable(&pdev->dev);
 +      return ret;
 +}
 +
  static const struct amba_id etm4_ids[] = {
        CS_AMBA_ID(0x000bb95d),                 /* Cortex-A53 */
        CS_AMBA_ID(0x000bb95e),                 /* Cortex-A57 */

diff --cc drivers/hwtracing/coresight/coresight-funnel.c
Simple merge

diff --cc drivers/hwtracing/coresight/coresight-replicator.c
Simple merge

diff --cc drivers/hwtracing/coresight/coresight-stm.c
Simple merge

diff --cc drivers/hwtracing/coresight/coresight-tmc-core.c
Simple merge

diff --cc drivers/hwtracing/coresight/coresight-tpiu.c
Simple merge