Merge branch 'depends/omap-cleanup-headers-menelaus' into next/headers

Again, resolve conflicts identical to how Tony did.

Conflicts:
	arch/arm/mach-omap2/board-h4.c
	arch/arm/mach-omap2/board-n8x0.c

Signed-off-by: Olof Johansson <olof@lixom.net>

diff --cc arch/arm/mach-omap2/board-h4.c
index 366ebd9,3977a02..bd11b0a
--- 1/arch/arm/mach-omap2/board-h4.c
--- 2/arch/arm/mach-omap2/board-h4.c
+++ b/arch/arm/mach-omap2/board-h4.c
@@@ -31,8 -32,8 +32,7 @@@
  #include <asm/mach/arch.h>
  #include <asm/mach/map.h>
  
- #include <plat/menelaus.h>
 -#include <plat/dma.h>
 -#include <plat/gpmc.h>
 +#include <plat-omap/dma-omap.h>
  #include "debug-devices.h"
  
  #include <video/omapdss.h>

diff --cc arch/arm/mach-omap2/board-n8x0.c
index cea433b,e3e8325..e3efcb8
--- 1/arch/arm/mach-omap2/board-n8x0.c
--- 2/arch/arm/mach-omap2/board-n8x0.c
+++ b/arch/arm/mach-omap2/board-n8x0.c
@@@ -28,11 -29,9 +29,10 @@@
  #include <asm/mach-types.h>
  
  #include "common.h"
- #include <plat/menelaus.h>
 -#include <plat/mmc.h>
 +#include "mmc.h"
  
  #include "mux.h"
 +#include "gpmc-onenand.h"
  
  #define TUSB6010_ASYNC_CS     1
  #define TUSB6010_SYNC_CS      4