]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'drm-tegra/drm/for-next'
authorMark Brown <broonie@linaro.org>
Thu, 17 Oct 2013 13:55:09 +0000 (14:55 +0100)
committerMark Brown <broonie@linaro.org>
Thu, 17 Oct 2013 13:55:09 +0000 (14:55 +0100)
commitadc64dee8229a4505caa795adcf33c8ec854aa2a
tree0398978d15809c27408cabd84f8ef1cbdc423bde
parent00b2a4a64681dc2c940bc3532ac01235d2d7d7d1
parentc885e9891e7d05074eea8a6af9f6141360b130ae
Merge remote-tracking branch 'drm-tegra/drm/for-next'

Conflicts:
drivers/gpu/drm/tegra/Kconfig
drivers/gpu/drm/tegra/drm.c
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
drivers/gpu/drm/tegra/drm.c
include/drm/drmP.h