diff options
| author | Dave Airlie <airlied@redhat.com> | 2014-08-05 09:04:59 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2014-08-05 09:04:59 +1000 |
| commit | 5d42f82a9b8c5168d75cf59307cd271feca94464 (patch) | |
| tree | a7049189a2c814589b3ad7e6e776fb736f980967 /arch/.gitignore | |
| parent | c759606c96dc052373d4c36ea383595da46b04e9 (diff) | |
| parent | 19583ca584d6f574384e17fe7613dfaeadcdc4a6 (diff) | |
| download | op-kernel-dev-5d42f82a9b8c5168d75cf59307cd271feca94464.zip op-kernel-dev-5d42f82a9b8c5168d75cf59307cd271feca94464.tar.gz | |
Merge tag 'v3.16' into drm-next
Linux 3.16
backmerge requested by i915, nouveau and radeon authors
Conflicts:
drivers/gpu/drm/i915/i915_gem_render_state.c
drivers/gpu/drm/i915/intel_drv.h
Diffstat (limited to 'arch/.gitignore')
0 files changed, 0 insertions, 0 deletions
