From: Tony Lindgren <tony@atomide.com>
Date: Wed, 12 Jun 2013 17:16:51 +0000 (-0700)
Subject: Merge branch 'omap-for-v3.11/cleanup' into omap-for-v3.11/tmp-merge
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7d8f2c386bc983862d2d93a94b878b64d766f5ac;p=pandora-kernel.git

Merge branch 'omap-for-v3.11/cleanup' into omap-for-v3.11/tmp-merge

Conflicts:
	arch/arm/mach-omap2/omap_hwmod_33xx_data.c
---

7d8f2c386bc983862d2d93a94b878b64d766f5ac
Reading git-diff-tree failed