Merge branch 'omap-for-v3.11/mailbox' into omap-for-v3.11/tmp-merge
authorTony Lindgren <tony@atomide.com>
Tue, 18 Jun 2013 12:06:59 +0000 (05:06 -0700)
committerTony Lindgren <tony@atomide.com>
Tue, 18 Jun 2013 12:06:59 +0000 (05:06 -0700)
Conflicts:
arch/arm/mach-omap2/devices.c


Trivial merge