Merge git://proxy01.pd.intel.com:9419/git/mesa/drm into crestline
authorNian Wu <nian.wu@intel.com>
Mon, 12 Mar 2007 01:03:40 +0000 (09:03 +0800)
committerNian Wu <nian.wu@intel.com>
Mon, 12 Mar 2007 01:03:40 +0000 (09:03 +0800)
1  2 
shared-core/i915_dma.c

Simple merge