diff options
| author | Dave Airlie <airlied@redhat.com> | 2015-03-09 12:58:30 +0300 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2015-03-09 12:58:30 +0300 |
| commit | a8c6ecb3be7029881f7c95e5e201a629094a4e1a (patch) | |
| tree | eb006541f40528f51334eefc725f155c4ce386a6 /arch/arm/boot/dts/s3c6400.dtsi | |
| parent | 8dd0eb3566711d81bfbe2b4421b33f0dd723cec4 (diff) | |
| parent | 9eccca0843205f87c00404b663188b88eb248051 (diff) | |
| download | linux-a8c6ecb3be7029881f7c95e5e201a629094a4e1a.tar.xz | |
Merge tag 'v4.0-rc3' into drm-next
Linux 4.0-rc3 backmerge to fix two i915 conflicts, and get
some mainline bug fixes needed for my testing box
Conflicts:
drivers/gpu/drm/i915/i915_drv.h
drivers/gpu/drm/i915/intel_display.c
Diffstat (limited to 'arch/arm/boot/dts/s3c6400.dtsi')
0 files changed, 0 insertions, 0 deletions