Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 15 Jul 2011 17:21:07 +0000 (10:21 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 15 Jul 2011 17:21:07 +0000 (10:21 -0700)
commit375d0c0e70cf788fa74c658e5dd619a7abb7c5f7
tree07a53ae55261580137f5d9d69fc7d9c5365f3229
parentda1b001a2a2a9cb323e58327ed07ac4a5e6d96ea
parente3c1620434ac77b618ce74c024ace3559602ac99
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: add new NI pci ids