Merge branch 'for-linus' of git://gitorious.org/linux-omap-dss2/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 27 Jun 2010 14:36:16 +0000 (07:36 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 27 Jun 2010 14:36:16 +0000 (07:36 -0700)
commit7f607455c3b91fec267c48a4177526cbb5e501f4
tree8557e1e217c9d20f2f43cd40e1c47d6ee549db9b
parentbe1d29f59ca3ec7dfbbae24d4f68d357f5a31c4b
parentbc092a303a1b980c67324920471e23354b0721cd
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