]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
projects / karo-tx-linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 35dc8aa 76adb46)
Merge branch 'drm/next/platform' of git://linuxtv.org/pinchartl/media into drm-misc...
authorDaniel Vetter <daniel.vetter@ffwll.ch>
Sat, 11 Mar 2017 10:46:03 +0000 (11:46 +0100)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Sat, 11 Mar 2017 10:46:03 +0000 (11:46 +0100)
commita45216547e8925078b18b2a6b539100c3814e973
treefd07faaf4ad557152d71b336f9304c93075f41edtree | snapshot
parent35dc8aabc8783d6322a59d774af2858e5955d2abcommit | diff
parent76adb460fd939756db689f238d5c2ddb45469705commit | diff
Merge branch 'drm/next/platform' of git://linuxtv.org/pinchartl/media into drm-misc-next

Merge Laurent's drm_platform removal code. Only conflict is with the
drm_pci.h extraction, which allows me to fix up the misplayed
drm_platform_init fumble that 0day and Stephen Rothwell reported.

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
14 files changed:
Documentation/gpu/drm-internals.rst diff1 | diff2 | blob | history
drivers/gpu/drm/Makefile diff1 | diff2 | blob | history
drivers/gpu/drm/armada/armada_drv.c diff1 | diff2 | blob | history
drivers/gpu/drm/exynos/exynos_drm_drv.c diff1 | diff2 | blob | history
drivers/gpu/drm/exynos/exynos_drm_fbdev.c diff1 | diff2 | blob | history
drivers/gpu/drm/exynos/exynos_hdmi.c diff1 | diff2 | blob | history
drivers/gpu/drm/msm/msm_drv.c diff1 | diff2 | blob | history
drivers/gpu/drm/nouveau/nouveau_drm.c diff1 | diff2 | blob | history
drivers/gpu/drm/shmobile/shmob_drm_crtc.c diff1 | diff2 | blob | history
drivers/gpu/drm/shmobile/shmob_drm_drv.c diff1 | diff2 | blob | history
drivers/gpu/drm/sti/sti_drv.c diff1 | diff2 | blob | history
drivers/gpu/drm/tilcdc/tilcdc_drv.c diff1 | diff2 | blob | history
include/drm/drmP.h diff1 | diff2 | blob | history
include/drm/drm_pci.h diff1 | | blob | history
Linux kernel for KaRo TX COM modules