From: Tony Lindgren <tony@atomide.com>
Date: Mon, 9 Jul 2012 12:37:42 +0000 (-0700)
Subject: Merge branch 'devel-board' into tmp-merge
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8069b6c4dc9f85d7e7e7d3346b6b7338dee2ba6d;p=pandora-kernel.git

Merge branch 'devel-board' into tmp-merge

Conflicts:
	arch/arm/mach-omap2/common-board-devices.c
---

8069b6c4dc9f85d7e7e7d3346b6b7338dee2ba6d
Reading git-diff-tree failed