| commit | 7cebefe6cca5e8ff6ec9ba13ff9edb03d3c19fc7 | [log] [tgz] |
|---|---|---|
| author | Dave Airlie <airlied@redhat.com> | Wed Apr 03 06:44:02 2013 +1000 |
| committer | Dave Airlie <airlied@redhat.com> | Wed Apr 03 06:44:02 2013 +1000 |
| tree | 66f54af06f2aacb81d504dfd682c485ff3997cc3 | |
| parent | 1caa590075ddef41950c46123e80cd6a64505218 [diff] | |
| parent | e4604d8fe8492f8120cf92d4b60b3cc90ba87bd0 [diff] |
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