From: Tony Lindgren <tony@atomide.com>
Date: Wed, 29 Feb 2012 00:45:52 +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=25b6d5a7b9266c684e27d4ef5b44a686be7e26ac;p=pandora-kernel.git

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

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

25b6d5a7b9266c684e27d4ef5b44a686be7e26ac
Reading git-diff-tree failed