Daniel Vetter 54499b2a92 Merge tag 'drm-intel-fixes-2014-11-19' into drm-intel-next-queued ... So with all the code movement and extraction in intel_pm.c in -next git is hopelessly confused with commit 2208d655a9 Author: Daniel Vetter <daniel.vetter@ffwll.ch> Date: Fri Nov 14 09:25:29 2014 +0100 drm/i915: drop WaSetupGtModeTdRowDispatch:snb from -fixes. Worse even small changes in -next move around the conflict context so rerere is equally useless. Let's just backmerge and be done with it. Conflicts: drivers/gpu/drm/i915/i915_drv.c drivers/gpu/drm/i915/intel_pm.c Except for git getting lost no tricky conflicts really. Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>		2014-11-19 18:17:38 +01:00
..
acpi	ACPI and power management updates for 3.18-rc2	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
crypto	crypto: LLVMLinux: Add macro to remove use of VLAIS in crypto code	2014-10-14 10:51:22 +02:00
drm	Merge tag 'drm-intel-fixes-2014-11-19' into drm-intel-next-queued	2014-11-19 18:17:38 +01:00
dt-bindings	Few omap fixes for hangs and wrong pinctrl defines, and update	2014-11-16 15:09:53 -08:00
keys
kvm	arm/arm64: KVM: Fix BE accesses to GICv2 EISR and ELRSR regs	2014-10-16 10:57:41 +02:00
linux	power supply and reset changes for the v3.18-rc	2014-11-15 15:22:51 -08:00
math-emu
media
memory
misc
net	udptunnel: Add SKB_GSO_UDP_TUNNEL during gro_complete.	2014-11-10 15:09:45 -05:00
pcmcia
ras
rdma
rxrpc
scsi	scsi: set REQ_QUEUE for the blk-mq case	2014-10-28 09:53:43 +01:00
soc/tegra
sound	Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma	2014-10-18 18:11:04 -07:00
target
trace	Merge branch 'urgent-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu into core/urgent	2014-10-30 07:37:37 +01:00
uapi	Merge tag 'drm-intel-fixes-2014-11-19' into drm-intel-next-queued	2014-11-19 18:17:38 +01:00
video	fbdev changes for 3.18	2014-10-18 18:03:02 -07:00
xen
Kbuild