Merge branch 'drm-nouveau-next' of git://git.freedesktop.org/git/nouveau/linux-2...
authorDave Airlie <airlied@redhat.com>
Wed, 15 Jan 2014 05:01:11 +0000 (15:01 +1000)
committerDave Airlie <airlied@redhat.com>
Wed, 15 Jan 2014 05:01:11 +0000 (15:01 +1000)
commit703a8c2dfa5aa69b9b0a6684dc78ea28a2c7fe3e
treef724dc5a57d0c1f493f9bfc42f5aa91f547c1e03
parentabce1ec9b08a4f318f431e6b9a12524227ae7109
parentfdd239ac99a0cc298b382c5ab5e7bcd09e8933d7
Merge branch 'drm-nouveau-next' of git://git.freedesktop.org/git/nouveau/linux-2.6 into drm-fixes

Single regression fix for nouveau

* 'drm-nouveau-next' of git://git.freedesktop.org/git/nouveau/linux-2.6:
  drm/nouveau: fix null ptr dereferences on some boards
drivers/gpu/drm/nouveau/core/subdev/therm/ic.c