[git pull] drm merge for 3.3-rc1.

2012-01-10 Thread Dave Airlie
Hi Linus, This is the main pull request for the drm for this merge window. It has two conflicts with your tree, I've fixed them up in a separate drm-linus-merged branch if you don't want to exercise your merging fingers. Highlights: drm core: add plane support and userspace interface to expos

[git pull] drm merge for 3.3-rc1.

2012-01-10 Thread Dave Airlie
Hi Linus, This is the main pull request for the drm for this merge window. It has two conflicts with your tree, I've fixed them up in a separate drm-linus-merged branch if you don't want to exercise your merging fingers. Highlights: drm core: add plane support and userspace interface to expos