Merge branch 'at91-4.9-trunk/spi' into linux-4.9-at91

Author: Nicolas Ferre

MAINTAINERS

@@ -8081,7 +8081,6 @@ F:	include/linux/cciss*.h
 F:	include/uapi/linux/cciss*.h
 F:	Documentation/scsi/smartpqi.txt
 
->>>>>>> f8582c09dccd... MAINTAINERS: add at91 usart mfd driver
 MICROSOFT SURFACE PRO 3 BUTTON DRIVER
 M:	Chen Yu <yu.c.chen@intel.com>
 L:	platform-driver-x86@vger.kernel.org