tree e6f47b38877d8d7bfc772f7b97ff5439381bdd2e
parent 06718f151144aa5eea97cdf2813fe7eb70e73d17
parent a32839696a8eef813a1aff604fbad9a32dff6c95
author Linus Torvalds <torvalds@linux-foundation.org> 1322424356 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1322424356 -0800

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