From: Dave Airlie <airlied@gmail.com>
Date: Wed, 26 Jan 2011 07:12:42 +0000 (+1000)
Subject: Merge branch 'drm-nouveau-next' of git://git.freedesktop.org/git/nouveau/linux-2... 
X-Git-Tag: v2.6.38-rc3~25^2~7
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=52bb4a7391321b9f32c0b6e032d0a5e1796f1968;p=platform%2Fkernel%2Flinux-3.10.git

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

* 'drm-nouveau-next' of git://git.freedesktop.org/git/nouveau/linux-2.6:
  drm/nvc0/grctx: correct an off-by-one
  drm/nv50: Fix race with PFIFO during PGRAPH context destruction.
  drm/nouveau: Workaround incorrect DCB entry on a GeForce3 Ti 200.
  drm/nvc0: implement irq handler for whatever's at 0x14xxxx
  drm/nvc0: fix incorrect TPC register setup
  drm/nouveau: probe for adt7473 before f75375
  drm/nouveau: remove dead function definition
---

52bb4a7391321b9f32c0b6e032d0a5e1796f1968