From: Tony Lindgren <tony@atomide.com>
Date: Mon, 30 Apr 2012 17:13:03 +0000 (-0700)
Subject: Merge branch 'dt' into tmp-merge
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4b2d15533d6e013a5113c7091c461ffd980abf97;p=pandora-kernel.git

Merge branch 'dt' into tmp-merge

Conflicts:
	arch/arm/mach-omap2/board-generic.c
---

4b2d15533d6e013a5113c7091c461ffd980abf97
Reading git-diff-tree failed