From: Tony Lindgren <tony@atomide.com>
Date: Tue, 10 Jul 2012 07:45:25 +0000 (-0700)
Subject: Merge branch 'devel-omap5' into tmp-merge
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=932ac0c6a3cd8b05c084be6e308a818d3aa11444;p=pandora-kernel.git

Merge branch 'devel-omap5' into tmp-merge

Conflicts:
	Documentation/devicetree/bindings/arm/omap/omap.txt
	arch/arm/mach-omap2/Makefile
---

932ac0c6a3cd8b05c084be6e308a818d3aa11444
Reading git-diff-tree failed