From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 27 Nov 2011 20:05:56 +0000 (-0800)
Subject: Merge branch 'fbdev-for-linus' of git://github.com/schandinat/linux-2.6
X-Git-Tag: MMI-PSA29.97-13-9~17962
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=401d0069cb344f401bc9d264c31db55876ff78c0;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge branch 'fbdev-for-linus' of git://github.com/schandinat/linux-2.6

* 'fbdev-for-linus' of git://github.com/schandinat/linux-2.6:
  viafb: correct sync polarity for OLPC DCON
  video:da8xx-fb: Disable and reset sequence on version2 of LCDC
  OMAPDSS: DISPC: skip scaling calculations when not scaling
  OMAPFB: fix compilation warnings due to missing include
  OMAPDSS: HDMI: fix returned HDMI pixel clock
---

401d0069cb344f401bc9d264c31db55876ff78c0