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: omap-for-v3.8/fixes-for-merge-window-v4-signed~51^2~6 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6c97a189592fadaa928aa3e6c673e061823f1597;p=pandora-kernel.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 Reading git-diff-tree failed