From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 15 Feb 2013 20:03:09 +0000 (-0800)
Subject: Merge tag 'omapdss-for-3.8-rc8' of git://gitorious.org/linux-omap-dss2/linux
X-Git-Tag: firefly_0821_release~3680^2~1137
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=7ea76ebba9adf4b72e0e43045447da50d7fc7bd6;p=firefly-linux-kernel-4.4.55.git

Merge tag 'omapdss-for-3.8-rc8' of git://gitorious.org/linux-omap-dss2/linux

Pull omapdss fixes from Tomi Valkeinen:
 "It'd be great if these two late fixes would still make it into 3.8.
  The other one fixes ARM kernel compilation when using 'allyesconfig',
  and the other makes DPI displays function again on OMAP3630 boards:

   - Fix ARM compilation with "allyesconfig" (omapdrm: fix the
     dependency to omapdss)

   - fix DPI displays on OMAP3630 (OMAPDSS: add FEAT_DPI_USES_VDDS_DSI
     to omap3630_dss_feat_list)"

* tag 'omapdss-for-3.8-rc8' of git://gitorious.org/linux-omap-dss2/linux:
  omapdrm: fix the dependency to omapdss
  OMAPDSS: add FEAT_DPI_USES_VDDS_DSI to omap3630_dss_feat_list
---

7ea76ebba9adf4b72e0e43045447da50d7fc7bd6