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

Conflicts:
	drivers/net/ethernet/ti/davinci_mdio.c

diff --cc Documentation/pinctrl.txt
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/i2c/busses/i2c-nomadik.c
Simple merge

diff --cc drivers/net/ethernet/ti/cpsw.c
Simple merge

diff --cc drivers/net/ethernet/ti/davinci_mdio.c
index c47f0dbcebb513d7a33c49c92725350e13d73c6e,5e361f411ea4f1d83e1e2fbda852f0491cd40eca..ce7c4991e41c6473fe0e05b18759127482416920
--- 1/drivers/net/ethernet/ti/davinci_mdio.c
--- 2/drivers/net/ethernet/ti/davinci_mdio.c
+++ b/drivers/net/ethernet/ti/davinci_mdio.c
@@@ -449,22 -453,32 +453,28 @@@ static int davinci_mdio_suspend(struct 
        __raw_writel(ctrl, &data->regs->control);
        wait_for_idle(data);
  
 -      pm_runtime_put_sync(data->dev);
 -
        data->suspended = true;
        spin_unlock(&data->lock);
 +      pm_runtime_put_sync(data->dev);
  
+       /* Select sleep pin state */
+       pinctrl_pm_select_sleep_state(dev);
+ 
        return 0;
  }
  
  static int davinci_mdio_resume(struct device *dev)
  {
        struct davinci_mdio_data *data = dev_get_drvdata(dev);
 -      u32 ctrl;
  
 -      spin_lock(&data->lock);
+       /* Select default pin state */
+       pinctrl_pm_select_default_state(dev);
+ 
        pm_runtime_get_sync(data->dev);
  
 +      spin_lock(&data->lock);
        /* restart the scan state machine */
 -      ctrl = __raw_readl(&data->regs->control);
 -      ctrl |= CONTROL_ENABLE;
 -      __raw_writel(ctrl, &data->regs->control);
 +      __davinci_mdio_reset(data);
  
        data->suspended = false;
        spin_unlock(&data->lock);

diff --cc drivers/spi/spi-pl022.c
Simple merge

diff --cc drivers/tty/serial/amba-pl011.c
Simple merge