tree 7661537f37443c952d594821761cc11e52e5514e
parent 2240a7bb479c38434bd636da9ce6afbd3f49447a
parent cd5cfce856684e13b9b57d46b78bb827e9c4da3c
author Linus Torvalds <torvalds@linux-foundation.org> 1323920740 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1323920740 -0800

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