From: Tony Lindgren <tony@atomide.com>
Date: Tue, 10 Jul 2012 07:38:53 +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=6cea83e0aa05c02a4347f8ded47ba03001a3a8d8;p=pandora-kernel.git

Merge branch 'devel-board' into tmp-merge

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

6cea83e0aa05c02a4347f8ded47ba03001a3a8d8
Reading git-diff-tree failed