Daniel Vetter c0c8b9ed1b Merge tag 'drm-for-v4.9' into drm-intel-next-queued ... It's been over two months, git definitely lost it's marbles. Conflicts resolved by picking our version, plus manually checking the diff with the parent in drm-intel-next-queued to make sure git didn't do anything stupid. It did, so I removed 2 occasions where it double-inserted a bit of code. The diff is now just - kernel-doc changes - drm format/name changes - display-info changes so looks all reasonable. Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>		2016-10-12 08:22:25 +02:00
..
acpi
asm-generic	Merge branch 'uaccess-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2016-09-14 09:35:05 -07:00
clocksource
crypto
drm	Merge tag 'drm-for-v4.9' into drm-intel-next-queued	2016-10-12 08:22:25 +02:00
dt-bindings	Merge branch 'drm-tda998x-devel' of git://git.armlinux.org.uk/~rmk/linux-arm into drm-next	2016-09-13 10:28:17 +10:00
keys
kvm
linux	Linux 4.8-rc8	2016-09-28 12:08:49 +10:00
math-emu
media	[media] cec: rename cec_devnode fhs_lock to just lock	2016-08-22 13:09:06 -03:00
memory
misc
net	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec	2016-09-22 02:56:23 -04:00
pcmcia
ras
rdma	IB/core: Use memdup_user() rather than duplicating its implementation	2016-08-23 12:40:13 -04:00
rxrpc
scsi	Merge remote-tracking branch 'mkp-scsi/4.8/scsi-fixes' into fixes	2016-08-19 07:41:12 -07:00
soc
sound	drm/i915/dp: DP audio API changes for MST	2016-09-22 09:01:55 -07:00
target
trace	Luiz Capitulino noticed that the tick_stop tracepoint wasn't being parsed	2016-08-09 10:34:09 -07:00
uapi	uapi: add missing install of sync_file.h	2016-10-04 08:23:15 +02:00
video	gpu: ipu-v3: Add queued image conversion support	2016-09-19 08:30:27 +02:00
xen	xen: change the type of xen_vcpu_id to uint32_t	2016-08-24 18:17:27 +01:00
Kbuild