From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 17 Jan 2011 18:57:59 +0000 (-0800)
Subject: Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied... 
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=584ef2cd70acb0e473ba51e1073c2c5c95a2d27a;p=openwrt%2Fstaging%2Fblogic.git

Merge branch 'drm-fixes' of git://git./linux/kernel/git/airlied/drm-2.6

* 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
  drm/radeon/kms: balance asic_reset functions
  drm/radeon/kms: remove duplicate card_posted() functions
  drm/radeon/kms: add module option for pcie gen2
  drm/radeon/kms: fix typo in evergreen safe reg
  drm/nouveau: fix gpu page faults triggered by plymouthd
  drm/nouveau: greatly simplify mm, killing some bugs in the process
  drm/nvc0: enable protection of system-use-only structures in vm
  drm/nv40: initialise 0x17xx on all chipsets that have it
  drm/nv40: make detection of 0x4097-ful chipsets available everywhere
---

584ef2cd70acb0e473ba51e1073c2c5c95a2d27a