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
..
asm-generic	bpf: enable bpf syscall on x64 and i386	2014-09-26 15:05:14 -04:00
drm	drm/i915: Make the physical object coherent with GTT	2014-11-14 10:29:18 +01:00
linux	bridge: include in6.h in if_bridge.h for struct in6_addr	2014-11-05 17:13:34 -05:00
misc	cxl: Add documentation for userspace APIs	2014-10-08 20:16:19 +11:00
mtd	mtd: lpddr: add driver for LPDDR2-NVM PCM memories	2014-05-20 17:45:17 -07:00
rdma	Merge branches 'core', 'cxgb4', 'ipoib', 'iser', 'iwcm', 'mad', 'misc', 'mlx4', 'mlx5', 'ocrdma' and 'srp' into for-next	2014-08-14 08:58:04 -07:00
scsi	…
sound	ALSA: pcm: add new DSD sampleformat for native DSD playback on XMOS based devices	2014-09-08 17:11:00 +02:00
video	…
xen	xen: install xen/gntdev.h and xen/gntalloc.h	2014-02-11 10:12:36 -05:00
Kbuild	cxl: Add userspace header file	2014-10-08 20:15:57 +11:00