From: Dave Airlie <airlied@redhat.com>
Date: Tue, 16 Oct 2012 06:33:48 +0000 (+1000)
Subject: Merge branch 'drm-nouveau-fixes' of git://anongit.freedesktop.org/git/nouveau/linux... 
X-Git-Tag: next-20121018~90^2~1
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=30f02cb7dd2e6a677c1d5ccd614024f2ebec8f1b;p=karo-tx-linux.git

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
---

30f02cb7dd2e6a677c1d5ccd614024f2ebec8f1b