Merge remote-tracking branches 'spi/topic/blackfin', 'spi/topic/cadence', 'spi/topic...

diff --cc drivers/spi/Kconfig
Simple merge

diff --cc drivers/spi/spi.c
index 865786012579d5a4a538b61b2ec32642a4639804,c64a3e59fce30a7f9658afcca246a6d6872627da,c64a3e59fce30a7f9658afcca246a6d6872627da,31d4d9d997e2b8cd55c73d97ae537a8b82d23b36,7713253229958620437e61617b28780df844a57f..900a91bdb3a897c05143fd25b7689549723be454
--- 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
+++ b/drivers/spi/spi.c
@@@@@@ -850,9 -851,6 -851,6 -851,9 -851,9 +850,9 @@@@@@ out
        if (msg->status == -EINPROGRESS)
                msg->status = ret;
     
-  -    if (msg->status)
++++    if (msg->status && master->handle_err)
 ++             master->handle_err(master, msg);
 ++  
        spi_finalize_current_message(master);
     
        return ret;

diff --cc include/linux/spi/spi.h
index 71e9d880f86e44f5f9a54eed68b35cb192a45585,ed9489d893a487f250868f8de603c84e707feaf8,ed9489d893a487f250868f8de603c84e707feaf8,4eaac3a5227bdc2d112f221c49f0e5147cdd0af2,5685af84a64dbe3f9f5897e7c99b26c89dfc41c3..478c468454609e9eee1c596dbd6d0cae6b1fb5fd
--- 1/include/linux/spi/spi.h
--- 2/include/linux/spi/spi.h
--- 3/include/linux/spi/spi.h
--- 4/include/linux/spi/spi.h
--- 5/include/linux/spi/spi.h
+++ b/include/linux/spi/spi.h
@@@@@@ -294,8 -294,6 -294,6 -294,8 -294,8 +294,8 @@@@@@ static inline void spi_unregister_drive
      *                    transfer_one_message are mutually exclusive; when both
      *                    are set, the generic subsystem does not call your
      *                    transfer_one callback.
-  -  * @handle_err: the subsystem calls the driver to handle and error that occurs
++++  * @handle_err: the subsystem calls the driver to handle an error that occurs
 ++   *         in the generic implementation of transfer_one_message().
      * @unprepare_message: undo any work done by prepare_message().
      * @cs_gpios: Array of GPIOs to use as chip select lines; one per CS
      * number. Any individual value may be -ENOENT for CS lines that