From: Tomi Valkeinen <tomi.valkeinen@ti.com>
Date: Thu, 30 Oct 2014 12:53:49 +0000 (+0200)
Subject: Merge branch '3.18/omapdss-fixes' into 3.18/fbdev-fixes
X-Git-Tag: v3.18-rc3~29^2
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=a942535d6e5c23f0015d6674d28c91dd59a720e4;p=~emulex%2Finfiniband.git

Merge branch '3.18/omapdss-fixes' into 3.18/fbdev-fixes
---

a942535d6e5c23f0015d6674d28c91dd59a720e4