| commit | 93bb70e0c00f1be4cc857e4d8375c44058cce71e | [log] [tgz] |
|---|---|---|
| author | Dave Airlie <airlied@redhat.com> | Mon Aug 27 16:22:20 2012 +1000 |
| committer | Dave Airlie <airlied@redhat.com> | Mon Aug 27 16:22:20 2012 +1000 |
| tree | 7b6a11844e00b3f4bf8281c7a799e61494220819 | |
| parent | 6f314ebbaa2667d67a7206ba78f28e46cf47eda5 [diff] | |
| parent | c182ae42cc3611f7b3fa803c0bcab6e5d29bea63 [diff] |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into drm-next There was some merge conflicts in -next and they weren't so pretty, so backmerge now to avoid them. Conflicts: drivers/gpu/drm/i915/i915_gem.c drivers/gpu/drm/i915/intel_modes.c