From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 11 Dec 2009 05:55:17 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://gitorious.org/linux-omap-dss2/linux
X-Git-Tag: v2.6.33-rc1~325
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=aa2cf420593b67cc93de7a3f675b2a88eba0505f;p=~emulex%2Finfiniband.git

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

* 'for-linus' of git://gitorious.org/linux-omap-dss2/linux:
  MAINTAINERS: Add OMAP2/3 DSS and OMAPFB maintainer
  OMAP: SDP: Enable DSS2 for OMAP3 SDP board
  OMAP: DSS2: Taal DSI command mode panel driver
  OMAP: DSS2: Add generic and Sharp panel drivers
  OMAP: DSS2: omapfb driver
  OMAP: DSS2: DSI driver
  OMAP: DSS2: SDI driver
  OMAP: DSS2: RFBI driver
  OMAP: DSS2: Video encoder driver
  OMAP: DSS2: DPI driver
  OMAP: DSS2: DISPC
  OMAP: DSS2: Add more core files
  OMAP: DSS2: Display Subsystem Driver core
  OMAP: DSS2: Documentation for DSS2
  OMAP: Add support for VRFB rotation engine
  OMAP: Add VRAM manager
  OMAP: OMAPFB: add omapdss device
  OMAP: OMAPFB: split omapfb.h
  OMAP2: Add funcs for writing SMS_ROT_* registers
---

aa2cf420593b67cc93de7a3f675b2a88eba0505f