Merge branch 'for-linus' into for-next
authorTakashi Iwai <tiwai@suse.de>
Tue, 7 Feb 2017 08:38:44 +0000 (09:38 +0100)
committerTakashi Iwai <tiwai@suse.de>
Tue, 7 Feb 2017 08:38:44 +0000 (09:38 +0100)
commit1e94320ffee29424ef70cdbb7f5601216382b7e6
tree5558a860abefef6d348cd586cb3aa177de0d1476
parente1b239f371c0c745542cb8108d085ec728e8a69c
parentf3d83317a69e7d658e7c83e24f8b31ac533c39e3
Merge branch 'for-linus' into for-next
drivers/gpu/drm/i915/i915_drv.c
drivers/gpu/drm/i915/i915_drv.h
drivers/gpu/drm/i915/intel_drv.h