From: Tony Lindgren <tony@atomide.com>
Date: Wed, 4 Aug 2010 13:10:38 +0000 (+0300)
Subject: Merge branch 'v2.6.35-omap-mailbox-for-next' of git://gitorious.org/~doyu/lk/mainline... 
X-Git-Tag: firefly_0821_release~9833^2~1223^2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=d21872b3683ff37f73c68993749a6e6aeeaed265;p=firefly-linux-kernel-4.4.55.git

Merge branch 'v2.6.35-omap-mailbox-for-next' of git://gitorious.org/~doyu/lk/mainline into omap-for-linus

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

d21872b3683ff37f73c68993749a6e6aeeaed265