Dave Airlie a5a0fc6743 Merge branch 'exynos-drm-next' of git://git.infradead.org/users/kmpark/linux-samsung into drm-next ... Inki writes: "this patch set updates exynos drm framework and includes minor fixups. and this pull request except hdmi device tree support patch set posted by Rahul Sharma because that includes media side patch so for this patch set, we may have git pull one more time in addition, if we get an agreement with media guys. for this patch, you can refer to below link, http://comments.gmane.org/gmane.comp.video.dri.devel/74504 this pull request adds hdmi device tree support and includes related patch set such as disabling of hdmi internal interrupt, suppport for platform variants for hdmi and mixer, support to disable video processor based on platform type and removal of drm common platform data. as you know, this patch set was delayed because it included an media side patch. so for this, we got an ack from v4l2-based hdmi driver author, Tomasz Stanislawski." * 'exynos-drm-next' of git://git.infradead.org/users/kmpark/linux-samsung: (34 commits) drm: exynos: hdmi: remove drm common hdmi platform data struct drm: exynos: hdmi: add support for exynos5 hdmi drm: exynos: hdmi: replace is_v13 with version check in hdmi drm: exynos: hdmi: add support for exynos5 mixer drm: exynos: hdmi: add support to disable video processor in mixer drm: exynos: hdmi: add support for platform variants for mixer drm: exynos: hdmi: add support for exynos5 hdmiphy drm: exynos: hdmi: add support for exynos5 ddc drm: exynos: remove drm hdmi platform data struct drm: exynos: hdmi: turn off HPD interrupt in HDMI chip drm: exynos: hdmi: use s5p-hdmi platform data drm: exynos: hdmi: fix interrupt handling drm: exynos: hdmi: support for platform variants media: s5p-hdmi: add HPD GPIO to platform data drm/exynos: fix kcalloc size of g2d cmdlist node drm/exynos: fix to calculate CRTC shown via screen drm/exynos: fix display power call issue. drm/exynos: add platform_device_id table and driver data for drm fimd drm/exynos: Fix potential NULL pointer dereference drm/exynos: support drm_wait_vblank feature for VIDI ... Conflicts: include/drm/exynos_drm.h		2012-10-07 21:06:33 +10:00
..
acpi	Prepared for main script	2012-10-03 13:45:43 -07:00
asm-generic	Merge branch 'uapi-prep' of git://git.infradead.org/users/dhowells/linux-headers	2012-10-07 07:55:10 +09:00
clocksource	arm64: Generic timers support	2012-09-17 13:42:20 +01:00
crypto
drm	Merge branch 'exynos-drm-next' of git://git.infradead.org/users/kmpark/linux-samsung into drm-next	2012-10-07 21:06:33 +10:00
keys
linux	Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media	2012-10-07 17:49:05 +09:00
math-emu
media	Merge branch 'exynos-drm-next' of git://git.infradead.org/users/kmpark/linux-samsung into drm-next	2012-10-07 21:06:33 +10:00
memory
misc
mtd
net	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-10-06 03:11:59 +09:00
pcmcia
ras
rdma	IB/core: Add ib_find_exact_cached_pkey()	2012-09-30 20:33:30 -07:00
rxrpc
scsi	Prepared for main script	2012-10-03 13:45:43 -07:00
sound	Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media	2012-10-07 17:49:05 +09:00
target
trace	UAPI: (Scripted) Convert #include "..." to #include <path/...> in kernel system headers	2012-10-02 18:01:25 +01:00
uapi	UAPI: (Scripted) Disintegrate include/drm	2012-10-04 18:21:50 +01:00
video	ARM: clps711x: Remove board support for CEIVA	2012-09-28 21:14:08 +02:00
xen	Features:	2012-10-07 07:13:01 +09:00
Kbuild