linux/drivers/gpu/drm/i2c
Dave Airlie b3869b17fd Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into drm-next
This backmerges drm-fixes into drm-next mainly for the amdkfd
stuff, I'm not 100% confident, but it builds and the amdkfd
folks can fix anything up.

Signed-off-by: Dave Airlie <airlied@redhat.com>
Conflicts:
	drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c
	drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.h
2015-01-29 11:45:31 +10:00
..
Kconfig drm: Add adv7511 encoder driver 2014-11-26 20:09:40 +02:00
Makefile drm: Add adv7511 encoder driver 2014-11-26 20:09:40 +02:00
adv7511.c drm: adv7511: Remove interlaced mode check 2014-12-23 12:01:47 +02:00
adv7511.h drm: Add adv7511 encoder driver 2014-11-26 20:09:40 +02:00
ch7006_drv.c drm: encapsulate crtc->set_config calls 2013-01-20 15:57:58 +01:00
ch7006_mode.c drm: Make the .mode_fixup() operations mode argument a const pointer 2012-07-19 21:52:38 -04:00
ch7006_priv.h UAPI: (Scripted) Convert #include "..." to #include <path/...> in drivers/gpu/ 2012-10-02 18:01:07 +01:00
sil164_drv.c UAPI: (Scripted) Convert #include "..." to #include <path/...> in drivers/gpu/ 2012-10-02 18:01:07 +01:00
tda998x_drv.c drm/i2c: tda998x: set the CEC I2C address based on the slave I2C address 2015-01-21 14:20:11 +00:00