]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
Merge tag 'omapdss-for-3.8-rc8' of git://gitorious.org/linux-omap-dss2/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 15 Feb 2013 20:03:09 +0000 (12:03 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 15 Feb 2013 20:03:09 +0000 (12:03 -0800)
commit7ea76ebba9adf4b72e0e43045447da50d7fc7bd6
tree2d9344061352730fec043dc90336be710def3482
parentf0a34ac98b3e71879c736fb8a6adc45badcb9f78
parent91e83ffd6d3ba4de21202b4f541777a7a8db02c8
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