diff options
| author | Dave Airlie <airlied@redhat.com> | 2014-12-02 01:58:33 +0100 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2014-12-02 01:58:33 +0100 |
| commit | e8115e79aa62b6ebdb3e8e61ca4092cc32938afc (patch) | |
| tree | 42b791ab54ef9d5c73dcd49f907b8b37fa2f7e19 /mm/memory.c | |
| parent | Merge tag 'topic/core-stuff-2014-11-28' of git://anongit.freedesktop.org/drm-... (diff) | |
| parent | Linux 3.18-rc7 (diff) | |
| download | linux-e8115e79aa62b6ebdb3e8e61ca4092cc32938afc.tar.xz linux-e8115e79aa62b6ebdb3e8e61ca4092cc32938afc.zip | |
Merge tag 'v3.18-rc7' into drm-next
This fixes a bunch of conflicts prior to merging i915 tree.
Linux 3.18-rc7
Conflicts:
drivers/gpu/drm/exynos/exynos_drm_drv.c
drivers/gpu/drm/i915/i915_drv.c
drivers/gpu/drm/i915/intel_pm.c
drivers/gpu/drm/tegra/dc.c
Diffstat (limited to 'mm/memory.c')
0 files changed, 0 insertions, 0 deletions