From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 19 Sep 2011 14:55:43 +0000 (-0700)
Subject: Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
X-Git-Tag: v3.12-rc1~4775
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6d7c2b4cfa5cb17c9f84c949bfece17b60b0f929;p=kernel%2Fkernel-generic.git

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

* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
  drm/radeon/kms: Make GPU/CPU page size handling consistent in blit code (v2)
  drm/radeon/kms: fix typo in r100_blit_copy
  drm/radeon: Unreference GEM object outside of spinlock in page flip error path.
  drm/radeon: Don't read from CP ring write pointer registers.
  drm/ttm: request zeroed system memory pages for new TT buffer objects
---

6d7c2b4cfa5cb17c9f84c949bfece17b60b0f929