From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 15 Dec 2011 03:45:40 +0000 (-0800)
Subject: Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
X-Git-Tag: v3.2-rc6~15
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=55b02d2f4445ad625213817a1736bf2884d32547;p=thirdparty%2Fkernel%2Flinux.git

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
---

55b02d2f4445ad625213817a1736bf2884d32547