tree 8cbed7283567438fda8aea75a2ad4761acc6d826
parent e1288cd72f54e7fc16ae9ebb4d0647537ef848d4
parent 25b2ec5b643c9ea784e5a51e5e9602cd536965f2
author Linus Torvalds <torvalds@linux-foundation.org> 1295290679 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1295290679 -0800

Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/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