]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'drm-tegra/drm/for-next'
authorThierry Reding <treding@nvidia.com>
Thu, 24 Oct 2013 12:36:01 +0000 (14:36 +0200)
committerThierry Reding <treding@nvidia.com>
Thu, 24 Oct 2013 12:36:01 +0000 (14:36 +0200)
commitd2681d92a38408309779a6dd269bebb461e5ccfc
tree2d6d2fa80c3b0077b3a33ee29e046e5c12eff19b
parent125993869902324aeb80fdd867d39bd41c709318
parentf099513c3202390ca1bc00d1ae9c8f7fbf63f614
Merge remote-tracking branch 'drm-tegra/drm/for-next'

Conflicts:
drivers/gpu/drm/tegra/Kconfig
MAINTAINERS
drivers/gpu/drm/Kconfig
drivers/gpu/drm/Makefile
drivers/gpu/drm/drm_crtc_helper.c
drivers/gpu/drm/drm_drv.c
drivers/gpu/drm/tegra/Kconfig
include/drm/drmP.h