Merge branch 'fbdev-3.11' of git://gitorious.org/linux-omap-dss2/linux into fbdev...
authorJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Fri, 14 Jun 2013 09:52:18 +0000 (17:52 +0800)
committerJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Fri, 14 Jun 2013 09:52:18 +0000 (17:52 +0800)

Trivial merge