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)
commitab75d50d6ca72615259e4fa857effeb6192c28a9
treea4ebd36df847bea9a06da5d458d767d93111f170
parentb36972407747154abc0c5f2cdcf3b8ddbba4ff2e
parent0cd5c650d1bb36e0ba6b40abd1da1459d1a767f0
Merge git://proxy01.pd.intel.com:9419/git/mesa/drm into crestline
shared-core/i915_dma.c