summaryrefslogtreecommitdiff
path: root/security
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-07-11 16:17:14 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-07-11 16:17:14 -0700
commit918227bb1b59444a2c467711fd50cc22bb4a897b (patch)
tree3a7845dbb59f15b29508617fd646ad59448c7c1b /security
parent00c3e276c54ca7e102f1b771715da76b4e86a098 (diff)
parent373b43652150c9342168c846a1efbd81438ea241 (diff)
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
Diffstat (limited to 'security')
0 files changed, 0 insertions, 0 deletions