summaryrefslogtreecommitdiff
path: root/net/rds
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-10-03 19:31:14 +0400
committerLinus Torvalds <torvalds@linux-foundation.org>2014-10-03 19:31:14 +0400
commit80ad99da8bd213e12b925407f1c97a303aa8f87f (patch)
treef31f9409e2018154f1ceb2aa44194c6dd017e284 /net/rds
parent58586869599f6bb38aeca71a847cd77bfea74808 (diff)
parenteee0815dabbdd7d584bea8275f5758d25c97cb9b (diff)
downloadlinux-80ad99da8bd213e12b925407f1c97a303aa8f87f.tar.xz
Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
Pull drm fixes from Dave Airlie: "Nothing too major or scary. One i915 regression fix, nouveau has a tmds regression fix, along with a regression fix for the runtime pm code for optimus laptops not restoring the display hw correctly" * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux: drm/nouveau: make sure display hardware is reinitialised on runtime resume drm/nouveau: punt fbcon resume out to a workqueue drm/nouveau: fix regression on original nv50 board drm/nv50/disp: fix dpms regression on certain boards drm/i915: Flush the PTEs after updating them before suspend
Diffstat (limited to 'net/rds')
0 files changed, 0 insertions, 0 deletions