Merge branch 'drm-tracepoints' into drm-testing

diff --cc drivers/gpu/drm/Makefile
index b4b2b480d0cef5a38ce8962ced73625f329db2b7,3b02e04ec2c4ed7bdd0b1b7419ad86c45dae906c..df8f923228656c095f7c57d770aa8b0e7af2abc0
--- 1/drivers/gpu/drm/Makefile
--- 2/drivers/gpu/drm/Makefile
+++ b/drivers/gpu/drm/Makefile
@@@ -9,9 -9,10 +9,10 @@@ drm-y       := drm_auth.o drm_buffer.o 
                drm_drv.o drm_fops.o drm_gem.o drm_ioctl.o drm_irq.o \
                drm_lock.o drm_memory.o drm_proc.o drm_stub.o drm_vm.o \
                drm_agpsupport.o drm_scatter.o ati_pcigart.o drm_pci.o \
 -              drm_sysfs.o drm_hashtab.o drm_sman.o drm_mm.o \
 +              drm_platform.o drm_sysfs.o drm_hashtab.o drm_sman.o drm_mm.o \
                drm_crtc.o drm_modes.o drm_edid.o \
-               drm_info.o drm_debugfs.o drm_encoder_slave.o
+               drm_info.o drm_debugfs.o drm_encoder_slave.o \
+               drm_trace_points.o
  
  drm-$(CONFIG_COMPAT) += drm_ioc32.o
  

diff --cc drivers/gpu/drm/drm_irq.c
Simple merge

diff --cc include/drm/drmP.h
Simple merge