Merge branch 'omap-for-v3.18/mailbox' into omap-for-v3.18/tmp-merge
authorTony Lindgren <tony@atomide.com>
Tue, 9 Sep 2014 01:00:23 +0000 (18:00 -0700)
committerTony Lindgren <tony@atomide.com>
Tue, 9 Sep 2014 01:00:23 +0000 (18:00 -0700)

Trivial merge