From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 13 Jan 2010 05:04:04 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://gitorious.org/linux-omap-dss2/linux
X-Git-Tag: firefly_0821_release~9833^2~3392
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=90aeb7c01c2da631cb611871a50980cbb6ca7149;p=firefly-linux-kernel-4.4.55.git

Merge branch 'for-linus' of git://gitorious.org/linux-omap-dss2/linux

* 'for-linus' of git://gitorious.org/linux-omap-dss2/linux:
  OMAP: DSS2: OMAPFB: fix crash when panel driver was not loaded
  OMAP: DSS2: Reject scaling settings when they cannot be supported
  OMAP: DSS2: Make check-delay-loops consistent
  OMAP: DSS2: OMAPFB: fix omapfb_free_fbmem()
  video/omap: add __init/__exit macros to drivers/video/omap/lcd_htcherald.c
  OMAP: DSS2: Fix compile warning
  MAINTAINERS: Combine DSS2 and OMAPFB2 into one entry
  MAINTAINERS: change omapfb maintainer
  OMAP: OMAPFB: add dummy release function for omapdss
  OMAP: OMAPFB: fix clk_get for RFBI
  OMAP: DSS2: RFBI: convert to new kfifo API
  OMAP: DSS2: Fix crash when panel doesn't define enable_te()
  OMAP: DSS2: Collect interrupt statistics
  OMAP: DSS2: DSI: print debug DCS cmd in hex
  OMAP: DSS2: DSI: fix VC channels in send_short and send_null
---

90aeb7c01c2da631cb611871a50980cbb6ca7149