diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2015-06-23 08:31:49 +0200 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2015-06-23 14:01:53 +0200 |
| commit | 0b076ecdf343b029c4c2c3a94ffd0199d97aa46c (patch) | |
| tree | 38407c97a7f90cb46a9e8c487676a65ce2ed9209 /drivers/gpu/drm/omapdrm/omap_gem.c | |
| parent | c82435bbe5aca62fc54615ff8ba78134bfa33866 (diff) | |
| parent | 9eb1e57f564d4e6e10991402726cc83fe0b9172f (diff) | |
Merge remote-tracking branch 'airlied/drm-next' into HEAD
Backmerge drm-next because the conflict between Ander's atomic fixes
for 4.2 and Maartens future work are getting to unwielding to handle.
Conflicts:
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/i915/intel_ringbuffer.h
Just always take ours, same as git merge -X ours, but done by hand
because I didn't trust git: It's confusing that it doesn't show any
conflicts in the merge diff at all.
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Diffstat (limited to 'drivers/gpu/drm/omapdrm/omap_gem.c')
| -rw-r--r-- | drivers/gpu/drm/omapdrm/omap_gem.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/omapdrm/omap_gem.c b/drivers/gpu/drm/omapdrm/omap_gem.c index e9718b99a8a9f..2ab77801cf5f0 100644 --- a/drivers/gpu/drm/omapdrm/omap_gem.c +++ b/drivers/gpu/drm/omapdrm/omap_gem.c @@ -17,9 +17,9 @@ * this program. If not, see <http://www.gnu.org/licenses/>. */ - -#include <linux/spinlock.h> #include <linux/shmem_fs.h> +#include <linux/spinlock.h> + #include <drm/drm_vma_manager.h> #include "omap_drv.h" |