From: Dave Airlie <airlied@redhat.com>
Date: Thu, 25 Oct 2012 01:36:05 +0000 (+1000)
Subject: Merge branch 'drm-fixes-3.7' of git://people.freedesktop.org/~agd5f/linux into drm... 
X-Git-Tag: v3.7-rc3~22^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=96fb1a241de128d75d5335c24392b065033c2dbe;p=profile%2Fivi%2Fkernel-adaptation-intel-automotive.git

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

Alex writes:
"Fixes pull request for radeon.  The main things here are
fixing a ATPX regression from the acpi rework, fixing some
fallout from the async VM work, and fixing some module options
that were broken in certain cases.  Other than that, mainly
just bug fixes."

* 'drm-fixes-3.7' of git://people.freedesktop.org/~agd5f/linux:
  drm/radeon: fix ATPX regression in acpi rework
  drm/radeon: fix ATPX function documentation
  drm/radeon: move the retry to gem_object_create
  drm/radeon: move size limits to gem_object_create.
  drm/radeon: use vzalloc for gart pages
  drm/radeon: fix and simplify pot argument checks v3
  drm/radeon: fix header size estimation in VM code
  drm/radeon: remove set_page check from VM code
  drm/radeon: fix si_set_page v2
  drm/radeon: fix cayman_vm_set_page v2
  drm/radeon: fix PFP sync in vm_flush
  drm/radeon: add error output if VM CS fails on cayman
  drm/radeon: give each backlight a unique id
  drm/radeon: fix sparse warning
  drm/radeon: add some new SI PCI ids
---

96fb1a241de128d75d5335c24392b065033c2dbe