From: Tony Lindgren <tony@atomide.com>
Date: Mon, 9 Jul 2012 12:32:28 +0000 (-0700)
Subject: Merge branch 'cleanup-part2' into tmp-merge
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a4b0d2a84b106c89b1d6d835a451bbfe89961d52;p=pandora-kernel.git

Merge branch 'cleanup-part2' into tmp-merge

Conflicts:
	arch/arm/mach-omap2/prm2xxx_3xxx.h
---

a4b0d2a84b106c89b1d6d835a451bbfe89961d52
Reading git-diff-tree failed