Dave Airlie e8115e79aa Merge tag 'v3.18-rc7' into drm-next ...

This fixes a bunch of conflicts prior to merging i915 tree.

Linux 3.18-rc7

Conflicts:
	drivers/gpu/drm/exynos/exynos_drm_drv.c
	drivers/gpu/drm/i915/i915_drv.c
	drivers/gpu/drm/i915/intel_pm.c
	drivers/gpu/drm/tegra/dc.c

2014-12-02 10:58:33 +10:00

..

acpi

Merge tag 'pm+acpi-3.18-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

2014-10-24 11:29:31 -07:00

asm-generic

Merge git://git.infradead.org/users/eparis/audit

2014-10-19 16:25:56 -07:00

clocksource

ARM: pxa: Add non device-tree timer link to clocksource

2014-07-23 12:02:39 +02:00

crypto

crypto: LLVMLinux: Add macro to remove use of VLAIS in crypto code

2014-10-14 10:51:22 +02:00

drm

Merge tag 'topic/core-stuff-2014-11-28' of git://anongit.freedesktop.org/drm-intel into drm-next

2014-12-02 08:59:34 +10:00

dt-bindings

Merge tag 'clk-fixes-for-linus' of https://git.linaro.org/people/mike.turquette/linux

2014-11-25 17:52:56 -08:00

keys

KEYS: Restore partial ID matching functionality for asymmetric keys

2014-10-06 15:21:05 +01:00

kvm

arm/arm64: KVM: Fix BE accesses to GICv2 EISR and ELRSR regs

2014-10-16 10:57:41 +02:00

linux

Merge tag 'v3.18-rc7' into drm-next

2014-12-02 10:58:33 +10:00

math-emu

…

media

Merge branch 'patchwork' into v4l_for_linus

2014-10-09 14:00:54 -03:00

memory

…

misc

cxl: Add new header for call backs and structs

2014-10-08 20:15:43 +11:00

net

net-timestamp: make tcp_recvmsg call ipv6_recv_error for AF_INET6 socks

2014-11-26 15:45:04 -05:00

pcmcia

…

ras

PCI/AER: Rename PCI_ERR_UNC_TRAIN to PCI_ERR_UNC_UND

2014-09-25 09:42:40 -06:00

rdma

IB/mlx5, iser, isert: Add Signature API additions

2014-10-09 00:10:53 -07:00

rxrpc

include/rxrpc/types.h: Remove unused header

2014-08-29 20:33:39 -07:00

scsi

scsi: set REQ_QUEUE for the blk-mq case

2014-10-28 09:53:43 +01:00

soc/tegra

ARM: tegra: Convert PMC to a driver

2014-07-17 14:58:43 +02:00

sound

ALSA: pcm: Add big-endian DSD sample formats and fix XMOS DSD sample format

2014-11-21 15:13:28 +01:00

target

target: Add force_pr_aptpl device attribute

2014-10-04 05:41:20 +00:00

trace

Merge tag 'drm/tegra/for-3.19-rc1' of git://people.freedesktop.org/~tagr/linux into drm-next

2014-11-15 09:38:55 +10:00

uapi

Merge tag 'v3.18-rc7' into drm-next

2014-12-02 10:58:33 +10:00

video

Merge tag 'fbdev-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux

2014-10-18 18:03:02 -07:00

xen

xen: remove DEFINE_XENBUS_DRIVER() macro

2014-10-06 10:27:57 +01:00

Kbuild

…