From: Tony Lindgren <tony@atomide.com>
Date: Tue, 18 Jun 2013 12:06:59 +0000 (-0700)
Subject: Merge branch 'omap-for-v3.11/mailbox' into omap-for-v3.11/tmp-merge
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=629d0527e43c04568ad44cb36b91c47fc44578a6;p=pandora-kernel.git

Merge branch 'omap-for-v3.11/mailbox' into omap-for-v3.11/tmp-merge

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

629d0527e43c04568ad44cb36b91c47fc44578a6
Reading git-diff-tree failed