Merge git://proxy01.pd.intel.com:9419/git/mesa/drm into crestline
authorNian Wu <nian.wu@intel.com>
Tue, 27 Mar 2007 04:53:13 +0000 (12:53 +0800)
committerNian Wu <nian.wu@intel.com>
Tue, 27 Mar 2007 04:53:13 +0000 (12:53 +0800)

Trivial merge