Merge remote-tracking branch 'mmc/mmc-next'

Conflicts:
	include/linux/omap-dma.h

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/mmc/host/rtsx_pci_sdmmc.c
Simple merge

diff --cc include/linux/omap-dmaengine.h
index 0000000000000000000000000000000000000000,2b0b6aa019221e5e9469e545b63ec96bd166f4ff..8e6906c72e9079abee55b360a2269a5e421c256f
mode 000000,100644..100644
--- /dev/null
--- 2/include/linux/omap-dmaengine.h
+++ b/include/linux/omap-dmaengine.h
@@@ -1,0 -1,21 +1,21 @@@
 -#if defined(CONFIG_DMA_OMAP) || defined(CONFIG_DMA_OMAP_MODULE)
+ /*
+  * OMAP DMA Engine support
+  *
+  * This program is free software; you can redistribute it and/or modify
+  * it under the terms of the GNU General Public License version 2 as
+  * published by the Free Software Foundation.
+  */
+ #ifndef __LINUX_OMAP_DMAENGINE_H
+ #define __LINUX_OMAP_DMAENGINE_H
+ 
+ struct dma_chan;
+ 
++#if defined(CONFIG_DMA_OMAP) || (defined(CONFIG_DMA_OMAP_MODULE) && defined(MODULE))
+ bool omap_dma_filter_fn(struct dma_chan *, void *);
+ #else
+ static inline bool omap_dma_filter_fn(struct dma_chan *c, void *d)
+ {
+       return false;
+ }
+ #endif
+ #endif /* __LINUX_OMAP_DMAENGINE_H */