From: Tony Lindgren <tony@atomide.com>
Date: Fri, 6 Jul 2012 12:01:22 +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=6441572650c0895da923b3266aa57921b5747b44;p=pandora-kernel.git

Merge branch 'devel-board' into tmp-merge

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

6441572650c0895da923b3266aa57921b5747b44
Reading git-diff-tree failed