git.karo-electronics.de Git - mv-sheeva.git/commit - drivers/net/wireless/ath/ath9k/init.c

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

author	Dave Airlie <airlied@gmail.com>
	Wed, 26 Jan 2011 07:12:42 +0000 (17:12 +1000)
committer	Dave Airlie <airlied@gmail.com>
	Wed, 26 Jan 2011 07:12:42 +0000 (17:12 +1000)
commit	52bb4a7391321b9f32c0b6e032d0a5e1796f1968
tree	e8d51066bc584605b41054c1c55a457efbed6e06	tree \| snapshot
parent	6663050edd9c2e8b1e1f55c09459144d84c045f0	commit \| diff
parent	5d07929808a6430d3d844db4da828dfadbc49cd2	commit \| diff

drivers/gpu/drm/nouveau/nouveau_bios.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/nouveau/nouveau_drv.h	diff1 \|	diff2 \|	blob \| history