From: Olof Johansson Date: Mon, 5 Nov 2012 18:28:21 +0000 (-0800) Subject: Merge branch 'depends/omap-cleanup-headers-menelaus' into next/headers X-Git-Tag: v3.8-rc1~145^2~6 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6c97a189592fadaa928aa3e6c673e061823f1597;p=thirdparty%2Flinux.git 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 --- 6c97a189592fadaa928aa3e6c673e061823f1597 diff --cc arch/arm/mach-omap2/board-h4.c index 366ebd93ae241,3977a0276b4c6..bd11b0aa9495c --- a/arch/arm/mach-omap2/board-h4.c +++ b/arch/arm/mach-omap2/board-h4.c @@@ -31,8 -32,8 +32,7 @@@ #include #include - #include -#include -#include +#include #include "debug-devices.h" #include