Merge commit 'keithp/drm-intel-next' into drm-intel-next
commitbe9f1c4f738a715abbd8ea742f3ec60a1ce73f4b
authorEric Anholt <eric@anholt.net>
Mon, 22 Jun 2009 05:14:55 +0000 (21 22:14 -0700)
committerEric Anholt <eric@anholt.net>
Mon, 22 Jun 2009 05:33:15 +0000 (21 22:33 -0700)
tree0385b0a9af9a0996e3b8f01a317f3e1da8637ae8
parent8c52da503b7e4cf961807f11824e3258ef9f7f1c
parentfb0f8fbf97e8a25074c81c629500d94cafa9e366
Merge commit 'keithp/drm-intel-next' into drm-intel-next
drivers/gpu/drm/i915/intel_hdmi.c