From: Tony Lindgren <tony@atomide.com>
Date: Fri, 29 Jun 2012 14:28:24 +0000 (-0700)
Subject: Merge branch 'cleanup' into tmp-merge
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a2f3bfc1f805da9946238c71109c882988d8a032;p=pandora-kernel.git

Merge branch 'cleanup' into tmp-merge

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

a2f3bfc1f805da9946238c71109c882988d8a032
Reading git-diff-tree failed