Merge remote-tracking branches 'spi/fix/au1550', 'spi/fix/davinci', 'spi/fix/doc...

diff --combined drivers/spi/spi.c
index e0531baf2782ae78f086db7af5201fcaef4bc92a,e0531baf2782ae78f086db7af5201fcaef4bc92a,e0531baf2782ae78f086db7af5201fcaef4bc92a,f52f3e647ef8572ccdf1a5fb09961f92d420de7b,e0531baf2782ae78f086db7af5201fcaef4bc92a,e6f076d5ffd5bb65c4c4fcc38efce1342ab5adec,e0531baf2782ae78f086db7af5201fcaef4bc92a,e0531baf2782ae78f086db7af5201fcaef4bc92a,e0531baf2782ae78f086db7af5201fcaef4bc92a..ca935df80c88e98b7ae2e8ddbd24cf87c54f55ef
--- 1/drivers/spi/spi.c
--- 2/drivers/spi/spi.c
--- 3/drivers/spi/spi.c
--- 4/drivers/spi/spi.c
--- 5/drivers/spi/spi.c
--- 6/drivers/spi/spi.c
--- 7/drivers/spi/spi.c
--- 8/drivers/spi/spi.c
--- 9/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
@@@@@@@@@@ -29,7 -29,7 -29,7 -29,6 -29,7 -29,6 -29,7 -29,7 -29,7 +29,7 @@@@@@@@@@
         #include <linux/mutex.h>
         #include <linux/of_device.h>
         #include <linux/of_irq.h>
   + +   #include <linux/clk/clk-conf.h>
         #include <linux/slab.h>
         #include <linux/mod_devicetable.h>
         #include <linux/spi/spi.h>
@@@@@@@@@@ -260,10 -260,10 -260,10 -259,6 -260,10 -259,6 -260,10 -260,10 -260,10 +260,10 @@@@@@@@@@ static int spi_drv_probe(struct device 
                const struct spi_driver         *sdrv = to_spi_driver(dev->driver);
                int ret;
         
   + +          ret = of_clk_set_defaults(dev->of_node, false);
   + +          if (ret)
   + +                  return ret;
   + +   
                acpi_dev_pm_attach(dev, true);
                ret = sdrv->probe(to_spi_device(dev));
                if (ret)
@@@@@@@@@@ -848,6 -848,6 -848,6 -843,7 -848,6 -843,6 -848,6 -848,6 -848,6 +848,7 @@@@@@@@@@ out
         
         /**
          * spi_finalize_current_transfer - report completion of a transfer
+++ +++++ * @master: the master reporting completion
          *
          * Called by SPI drivers using the core transfer_one_message()
          * implementation to notify it that the current interrupt driven