intel: Merge latest i915_drm.h
authorBen Widawsky <benjamin.widawsky@intel.com>
Thu, 2 Jan 2014 19:36:59 +0000 (11:36 -0800)
committerBen Widawsky <benjamin.widawsky@intel.com>
Fri, 10 Jan 2014 19:05:50 +0000 (11:05 -0800)
commita254cb50414a5def5c872a765c0dd1295a550c6b
treec10eb4b0009798fbf0b649cdad169f75a0abbe6f
parent3d34fe24957576d77c88877ded22e8ab5d96ca4c
intel: Merge latest i915_drm.h

This was not done as a straight copy because reset_stats IOCTL landed in
libdrm before upstream kernel.

Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
include/drm/i915_drm.h