From: Tony Lindgren <tony@atomide.com>
Date: Mon, 11 Jul 2011 11:20:51 +0000 (-0700)
Subject: Merge branch '4460' into tmp-merge
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d9542cd122c7cfc459b580b0af898aafd315774c;p=pandora-kernel.git

Merge branch '4460' into tmp-merge

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

d9542cd122c7cfc459b580b0af898aafd315774c
Reading git-diff-tree failed