| commit | 8229c885fe361e521ac64de36b16011e54a30de0 | [log] [tgz] |
|---|---|---|
| author | Dave Airlie <airlied@redhat.com> | Thu Mar 15 10:24:32 2012 +0000 |
| committer | Dave Airlie <airlied@redhat.com> | Thu Mar 15 10:24:32 2012 +0000 |
| tree | 572e5d34b16713ddef9e803308c6f72014aff01b | |
| parent | c3c50e8b651887bcefcc13beb3739c00b2379b5c [diff] | |
| parent | fde7d9049e55ab85a390be7f415d74c9f62dd0f9 [diff] |
drm: Merge tag 'v3.3-rc7' into drm-core-next Merge the fixes so far into core-next, needed to test intel driver. Conflicts: drivers/gpu/drm/i915/intel_ringbuffer.c