From: Dave Airlie <airlied@redhat.com>
Date: Thu, 22 Nov 2012 03:21:46 +0000 (+1000)
Subject: Merge branch 'drm-fixes-3.7' of git://people.freedesktop.org/~agd5f/linux into drm... 
X-Git-Tag: v3.7-rc7~20^2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=452f19201f35d20a1a6c9009acbcfa6799163c6a;p=users%2Fjedix%2Flinux-maple.git

Merge branch 'drm-fixes-3.7' of git://people.freedesktop.org/~agd5f/linux into drm-fixes

Alex writes:
A couple more small fixes for 3.7:
- another evergreen_mc fix
- add an AGP quirk for an old RV250
- new pci id.

* 'drm-fixes-3.7' of git://people.freedesktop.org/~agd5f/linux:
  drm/radeon: add new SI pci id
  radeon: add AGPMode 1 quirk for RV250
  drm/radeon: properly track the crtc not_enabled case evergreen_mc_stop()
---

452f19201f35d20a1a6c9009acbcfa6799163c6a