From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 11 Jul 2012 23:17:14 +0000 (-0700)
Subject: Merge tag 'fbdev-fixes-for-3.5-2' of git://github.com/schandinat/linux-2.6
X-Git-Tag: v3.5-rc7~22
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=918227bb1b59444a2c467711fd50cc22bb4a897b;p=profile%2Fivi%2Fkernel-x86-ivi.git

Merge tag 'fbdev-fixes-for-3.5-2' of git://github.com/schandinat/linux-2.6

Pull fbdev fixes from Florian Tobias Schandinat:
 "Two fixes for OMAPDSS by Tomi Valkeinen:
   - one to avoid warnings when runtime PM is not enabled
   - one workaround to dependancy issues during suspend/resume"

* tag 'fbdev-fixes-for-3.5-2' of git://github.com/schandinat/linux-2.6:
  OMAPDSS: fix warnings if CONFIG_PM_RUNTIME=n
  OMAPDSS: Use PM notifiers for system suspend
---

918227bb1b59444a2c467711fd50cc22bb4a897b