Merge tag 'v3.4-rc6' into next/cleanup

Linux 3.4-rc6

Resolve conflict where an u5500 file had a bugfix go in, but was
deleted in the branch staged for next merge window.

Signed-off-by: Olof Johansson <[email protected]>

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/plat-omap/dma.c
index 612227efe34f8bd6000d7aae35f801589fd1f841,c58d896cd5c39dba0ab5950d4fb69a657e0a5d0a..987e6101267df6d76eca0623115e61a05916933c
--- 1/arch/arm/plat-omap/dma.c
--- 2/arch/arm/plat-omap/dma.c
+++ b/arch/arm/plat-omap/dma.c
@@@ -974,9 -972,16 +981,16 @@@ void omap_stop_dma(int lch
                p->dma_write(l, CCR, lch);
        }
  
+       /*
+        * Ensure that data transferred by DMA is visible to any access
+        * after DMA has been disabled.  This is important for coherent
+        * DMA regions.
+        */
+       mb();
+ 
        if (!omap_dma_in_1510_mode() && dma_chan[lch].next_lch != -1) {
                int next_lch, cur_lch = lch;
 -              char dma_chan_link_map[dma_lch_count];
 +              char dma_chan_link_map[MAX_LOGICAL_DMA_CH_COUNT];
  
                memset(dma_chan_link_map, 0, sizeof(dma_chan_link_map));
                do {