]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
Merge branch 'drm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 23 Sep 2009 17:09:18 +0000 (10:09 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 23 Sep 2009 17:09:18 +0000 (10:09 -0700)
commit85afd82780df133f03185aec7943ee3e0ed56a7b
treeda1513f97a50a482e06ffbae2251d9461e8ca1ed
parenta7c367b95a9d8e65e0f0e7da31f700a556794efb
parent5b31aee9d72f529ee6b60e8d66967f817a0e39fc
Merge branch 'drm-next' of git://git.kernel.org/pub/scm/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.
drivers/gpu/drm/radeon/radeon.h