Merge branch 'omap-for-v3.8/cleanup-headers-dma' into omap-for-v3.8/cleanup-headers

Conflicts:
	drivers/crypto/omap-aes.c
	drivers/crypto/omap-sham.c
	drivers/dma/omap-dma.c

drivers/dma/omap-dma.c

@@ -19,7 +19,7 @@
 
 #include "virt-dma.h"
 
-#include <plat/dma.h>
+#include <plat-omap/dma-omap.h>
 
 #ifdef CONFIG_ARCH_OMAP2PLUS
 #define dma_omap2plus()	1