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

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

Conflicts:
	arch/arm/mach-omap2/io.c
---

8ccae6353cdb5869e1eedf3db2b8724eca09e1ec
Reading git-diff-tree failed