From: Olof Johansson <olof@lixom.net>
Date: Mon, 26 Nov 2012 05:34:34 +0000 (-0800)
Subject: Merge tag 'v3.7-rc7' into next/cleanup
X-Git-Tag: omap-for-v3.8/cleanup-multiplatform-signed~3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0f9cb211ba5db93d488fe6b154138231fdd0e22d;p=pandora-kernel.git

Merge tag 'v3.7-rc7' into next/cleanup

Merging in mainline back to next/cleanup since it has collected a few
conflicts between fixes going upstream and some of the cleanup patches.
Git doesn't auto-resolve some of them, and they're mostly noise so let's
take care of it locally.

Conflicts are in:
	arch/arm/mach-omap2/omap_hwmod_44xx_data.c
	arch/arm/plat-omap/i2c.c
	drivers/video/omap2/dss/dss.c

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

0f9cb211ba5db93d488fe6b154138231fdd0e22d
Reading git-diff-tree failed