Merge branch 'drm-nouveau-next' of git://git.freedesktop.org/git/nouveau/linux-2...

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

diff --cc drivers/gpu/drm/nouveau/nouveau_bios.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nouveau_drv.h
Simple merge