Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 15 Dec 2011 03:45:40 +0000 (19:45 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 15 Dec 2011 03:45:40 +0000 (19:45 -0800)
commit55b02d2f4445ad625213817a1736bf2884d32547
tree7661537f37443c952d594821761cc11e52e5514e
parent2240a7bb479c38434bd636da9ce6afbd3f49447a
parentcd5cfce856684e13b9b57d46b78bb827e9c4da3c
Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux

* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
  drm/radeon/kms: add some new pci ids