Daniel Vetter 967ad7f148 Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next ... The conflict in intel_drv.h tripped me up a bit since a patch in dinq moves all the functions around, but another one in drm-next removes a single function. So I'ev figured backing this into a backmerge would be good. i915_dma.c is just adjacent lines changed, nothing nefarious there. Conflicts: drivers/gpu/drm/i915/i915_dma.c drivers/gpu/drm/i915/intel_drv.h Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>		2013-10-10 12:44:43 +02:00
..
acpi
asm-generic	Merge branch 'for-v3.12' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping	2013-09-09 10:26:33 -07:00
clocksource	ARM: SoC cleanups for 3.12	2013-09-06 13:21:16 -07:00
crypto
drm	Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next	2013-10-10 12:44:43 +02:00
dt-bindings	Device tree core updates for v3.12	2013-09-10 13:53:52 -07:00
keys
kvm
linux	Char / Misc driver fixes for 3.12-rc3	2013-09-29 13:44:48 -07:00
math-emu
media	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2013-09-05 14:54:29 -07:00
memory
misc
net	ip: generate unique IP identificator if local fragmentation is allowed	2013-09-19 14:11:15 -04:00
pcmcia
ras
rdma	Merge branches 'cxgb4', 'flowsteer', 'ipoib', 'iser', 'mlx4', 'ocrdma' and 'qib' into for-next	2013-09-03 09:01:08 -07:00
rxrpc
scsi	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending	2013-09-12 16:11:45 -07:00
sound	sound fixes for 3.12-rc1	2013-09-12 08:52:41 -07:00
target	target/iscsi: Bump versions to v4.1.0	2013-09-10 20:23:37 -07:00
trace	Merge branch 'for-3.12/core' of git://git.kernel.dk/linux-block	2013-09-22 15:00:11 -07:00
uapi	drm: Reject stereo modes with an unknown layout	2013-10-01 07:45:45 +02:00
video	fbdev changes for 3.12:	2013-09-05 09:49:32 -07:00
xen	Features:	2013-09-04 17:45:39 -07:00
Kbuild