tree ee3e9dd4111d4aad12e579cb0c2c159114dff263
parent 41f13fe81dd1b08723ab9f3fc3c7f29cfa81f1a5
parent 07d43ba98621f08e252a48c96b258b4d572b0257
author Dave Airlie <airlied@redhat.com> 1238286138 -0400
committer Dave Airlie <airlied@redhat.com> 1238286138 -0400

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