From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 23 Sep 2009 17:09:18 +0000 (-0700)
Subject: Merge branch 'drm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied... 
X-Git-Tag: v2.6.32-rc1~159
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=85afd82780df133f03185aec7943ee3e0ed56a7b;p=linux-2.6-block.git

Merge branch 'drm-next' of git://git./linux/kernel/git/airlied/drm-2.6

* 'drm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
  drm/radeon/r600: set correct pitch for 4 byte copy
  drm/radeon: consolidate family flags used in pciids.
---

85afd82780df133f03185aec7943ee3e0ed56a7b