summaryrefslogtreecommitdiff
path: root/kernel/nsproxy.c
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2010-03-15 01:07:33 (GMT)
committerDave Airlie <airlied@redhat.com>2010-03-15 01:07:33 (GMT)
commitd5e5deddf67389eabc3d9b13004c108120d397e1 (patch)
tree2aa2320579e512cc99cab6d8992f42d038dcf466 /kernel/nsproxy.c
parent44fef22416886a04d432043f741a6faf2c6ffefd (diff)
parentf4053509669f904aec70c51e2ff75563ba7ae823 (diff)
downloadlinux-d5e5deddf67389eabc3d9b13004c108120d397e1.tar.xz
Merge remote branch 'nouveau/for-airlied' into drm-linus
* nouveau/for-airlied: drm/nouveau: add module option to disable TV detection drm/nouveau: Never evict VRAM buffers to system. drm/nv50: fix connector table parsing for some cards drm/nv50: add a memory barrier to pushbuf submission drm/nouveau: print a message very early during suspend drm/nv04-nv40: Fix up the programmed horizontal sync pulse delay. drm/nouveau: Gigabyte NX85T connector table lies, it has DVI-I not HDMI drm/nouveau: add option to allow override of dcb connector table types drm/nv50: Improve PGRAPH interrupt handling. drm/nv50: Make ctxprog wait until interrupt handler is done. drm/nouveau: Fix fbcon corruption with font width not divisible by 8 drm/nv50: Remove redundant/incorrect ctxvals initialisation.
Diffstat (limited to 'kernel/nsproxy.c')
0 files changed, 0 insertions, 0 deletions