From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 13 Jun 2012 14:57:30 +0000 (+0300)
Subject: Merge tag 'omapdss-for-3.5-rc2' of git://gitorious.org/linux-omap-dss2/linux
X-Git-Tag: firefly_0821_release~3680^2~2624
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=7794f709c5897e8876801ff205cc758c0e7bc901;p=firefly-linux-kernel-4.4.55.git

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

Pull omapdss build problem fix from Tomi Valkeinen:
 "Small fixes for omapdss driver.  Most importantly, fixes a build
  problem when debugfs or omapdss debug support is turned off, and fixes
  a suspend related crash."

This has apparently been annoying rmk for a while..

* tag 'omapdss-for-3.5-rc2' of git://gitorious.org/linux-omap-dss2/linux:
  OMAPDSS: fix registration of DPI and SDI devices
  OMAPDSS: DSI: Fix bug when calculating LP command interleaving parameters
  OMAPDSS: fix bogus WARN_ON in dss_runtime_put()
  OMAPDSS: Taal: fix compilation warning
  OMAPDSS: fix build when DEBUG_FS or DSS_DEBUG_SUPPORT disabled
---

7794f709c5897e8876801ff205cc758c0e7bc901