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: https://www.infradead.org/git/?a=commitdiff_plain;h=55b02d2f4445ad625213817a1736bf2884d32547;p=users%2Fjedix%2Flinux-maple.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