tree 6bf1bcce6448e80549e8b3937a3e45f73fe5e33f
parent 7b8505300525d7e802ecf52ae160bc63f4ba28d7
parent 565f571c48f01a681243a356e9083f5cf24b432e
author Dave Airlie <airlied@redhat.com> 1350369228 +1000
committer Dave Airlie <airlied@redhat.com> 1350369251 +1000

Merge branch 'drm-nouveau-fixes' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-fixes

minor set of nouveau fixes.

* 'drm-nouveau-fixes' of git://anongit.freedesktop.org/git/nouveau/linux-2.6:
  drm/nouveau/bios: fix typo in error message
  drm/nouveau: only call ttm_agp_tt_create when __OS_HAS_AGP
  drm/nv50/fb: fix double free of vram mm
  drm/nouveau/pm: do not stop reclocking if failing to set the fan speed
  drm/nouveau/pm: fix a typo related to the move to the therm subdev
  drm/nouveau/hwmon: fix the initialization condition