projects / platform / upstream / kernel-adaptation-pc.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7b85053 565f571)
Merge branch 'drm-nouveau-fixes' of git://anongit.freedesktop.org/git/nouveau/linux...
authorDave Airlie <airlied@redhat.com>
Tue, 16 Oct 2012 06:33:48 +0000 (16:33 +1000)
committerDave Airlie <airlied@redhat.com>
Tue, 16 Oct 2012 06:34:11 +0000 (16:34 +1000)
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

1  2 
drivers/gpu/drm/nouveau/nouveau_pm.c patch | diff1 | diff2 | blob | history

diff --cc drivers/gpu/drm/nouveau/nouveau_pm.c
Simple merge
Domain: System / Uncategorized;