Merge branch 'drm-nouveau-fixes-3.9' of git://anongit.freedesktop.org/git/nouveau...
authorDave Airlie <airlied@redhat.com>
Tue, 2 Apr 2013 20:44:02 +0000 (06:44 +1000)
committerDave Airlie <airlied@redhat.com>
Tue, 2 Apr 2013 20:44:02 +0000 (06:44 +1000)
Oops fixers.
* 'drm-nouveau-fixes-3.9' of git://anongit.freedesktop.org/git/nouveau/linux-2.6:
  drm/nouveau: fix NULL ptr dereference from nv50_disp_intr()
  drm/nouveau: fix handling empty channel list in ioctl's


Trivial merge