Merge branch 'master' into crestline
authorNian Wu <nian.wu@intel.com>
Fri, 10 Nov 2006 05:21:17 +0000 (21:21 -0800)
committerNian Wu <nian.wu@intel.com>
Fri, 10 Nov 2006 05:21:17 +0000 (21:21 -0800)
commit14e3f2711e90fe9a9c315d96abd4c7681539936a
tree6a562d9035e56671eb7905bac1f3829597f109a9
parente2ea72187e470c2c13adbd3fba4177bd4a0ecc37
parentd51e1bb56ca2f7858cdeac6f61a7b747c1e15b1e
Merge branch 'master' into crestline

Conflicts:

shared-core/i915_dma.c
shared-core/drm_pciids.txt
shared-core/i915_dma.c