From: Tony Lindgren <tony@atomide.com>
Date: Sun, 10 Jul 2011 20:07:11 +0000 (-0700)
Subject: Merge branch 'prcm-cleanup-3.1' of git://git.pwsan.com/linux-2.6 into tmp-rebuild... 
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8492acb3294ffd56d1f28fa6dc8f8826be68d6ec;p=pandora-kernel.git

Merge branch 'prcm-cleanup-3.1' of git://git.pwsan.com/linux-2.6 into tmp-rebuild-1310328401

Conflicts:
	arch/arm/mach-omap2/cm-regbits-44xx.h
---

8492acb3294ffd56d1f28fa6dc8f8826be68d6ec
Reading git-diff-tree failed