From: Tony Lindgren <tony@atomide.com>
Date: Mon, 10 Jun 2013 03:46:44 +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=a7e39db896c3068ed3b4ce3ff64539f2891578db;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
---

a7e39db896c3068ed3b4ce3ff64539f2891578db
Reading git-diff-tree failed