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)
commit7cebefe6cca5e8ff6ec9ba13ff9edb03d3c19fc7
tree66f54af06f2aacb81d504dfd682c485ff3997cc3
parent1caa590075ddef41950c46123e80cd6a64505218
parente4604d8fe8492f8120cf92d4b60b3cc90ba87bd0
Merge branch 'drm-nouveau-fixes-3.9' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-next

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