merge linus head to drm-mm branch

This commit is contained in:
Dave Airlie 2005-10-22 15:25:01 +10:00 committed by Dave Airlie
parent 23bfc1a339
commit 5fb4dc9bf5