From: Tony Lindgren <tony@atomide.com>
Date: Fri, 6 Jul 2012 11:59:38 +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=4b272858eb19722fd077f4e6f8a1edeb83d82ed7;p=pandora-kernel.git

Merge branch 'cleanup-part2' into tmp-merge

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

4b272858eb19722fd077f4e6f8a1edeb83d82ed7
Reading git-diff-tree failed