Merge branch 'master' into crestline
authorKeith Packard <keithp@neko.keithp.com>
Mon, 8 Jan 2007 06:37:40 +0000 (22:37 -0800)
committerKeith Packard <keithp@neko.keithp.com>
Mon, 8 Jan 2007 06:37:40 +0000 (22:37 -0800)
commitc5aaf7648df82665851c9e67f5509b427ca34c8e
tree55b317738a99097cb02ba6a736b9ef20de6b34f3
parent63c0f3946056d044b7c5688fa5cb670782212c77
parentd0080d71b9f3df0d4f743324b7e8f1ce580bdcaf
Merge branch 'master' into crestline

Conflicts:

shared-core/i915_drm.h

Whitespace change only
shared-core/drm_pciids.txt
shared-core/i915_dma.c