From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 27 Jun 2010 14:36:16 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://gitorious.org/linux-omap-dss2/linux
X-Git-Tag: v2.6.35-rc4~65
X-Git-Url: http://pileus.org/git/?a=commitdiff_plain;h=7f607455c3b91fec267c48a4177526cbb5e501f4;p=~andy%2Flinux

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

* 'for-linus' of git://gitorious.org/linux-omap-dss2/linux:
  OMAP: OMAPFB: fix rfbi.c compile error
  OMAPFB: LCDC: change update_mode to DISABLED when going suspend
---

7f607455c3b91fec267c48a4177526cbb5e501f4