From: Dave Airlie <airlied@redhat.com>
Date: Sun, 29 Mar 2009 00:22:18 +0000 (-0400)
Subject: drm: merge Linux master into HEAD
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=90f959bcb386da2c71613dcefc6a285e054a539e;p=linux-2.6-omap-h63xx.git

drm: merge Linux master into HEAD

Conflicts:
	drivers/gpu/drm/drm_info.c
	drivers/gpu/drm/drm_proc.c
	drivers/gpu/drm/i915/i915_gem_debugfs.c
---

90f959bcb386da2c71613dcefc6a285e054a539e