From: Tony Lindgren <tony@atomide.com>
Date: Tue, 6 Mar 2012 21:29:32 +0000 (-0800)
Subject: Merge branch 'fixes-non-critical' into tmp-merge
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=95bddd916e56bd454dba89b5c34399ab21934259;p=pandora-kernel.git

Merge branch 'fixes-non-critical' into tmp-merge

Conflicts:
	arch/arm/mach-omap2/Kconfig
---

95bddd916e56bd454dba89b5c34399ab21934259
Reading git-diff-tree failed