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>