Merge branch 'DRI2' 04212009_Alpha1.1-DRI2 local-branch-testing-rework-drm-04232009 menlow-port-rework-drm-04232009
authorAustin Yuan <shengquan.yuan@intel.com>
Wed, 22 Apr 2009 20:03:45 +0000 (16:03 -0400)
committerAustin Yuan <shengquan.yuan@intel.com>
Wed, 22 Apr 2009 20:03:45 +0000 (16:03 -0400)

Trivial merge