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
..
alpha	Merge git://git.infradead.org/users/eparis/audit	2014-10-19 16:25:56 -07:00
arc	The "weak" attribute is commonly used for the default version of a	2014-10-23 15:04:27 -07:00
arm	ARM: SoC fixes for 3.18-rc5	2014-11-16 16:21:57 -08:00
arm64	arm64 fixes:	2014-11-14 14:24:33 -08:00
avr32	Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma	2014-10-18 18:11:04 -07:00
blackfin	Merge branch 'for-3.18-consistent-ops' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu	2014-10-15 07:48:18 +02:00
c6x
cris	Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2014-10-13 16:23:15 +02:00
frv	frv: remove unused declarations of __start___ex_table and __stop___ex_table	2014-10-14 02:18:28 +02:00
hexagon	Merge branch 'locking-arch-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2014-10-13 15:48:00 +02:00
ia64	Merge branch 'x86-efi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2014-10-23 14:45:09 -07:00
m32r	Merge branch 'locking-arch-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2014-10-13 15:48:00 +02:00
m68k	m68k: Wire up bpf	2014-10-27 11:02:19 +01:00
metag	Merge branch 'for-3.18-consistent-ops' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu	2014-10-15 07:48:18 +02:00
microblaze	microblaze: Wire up bpf syscall	2014-10-27 09:25:34 +01:00
mips	MIPS: Fix build with binutils 2.24.51+	2014-11-07 15:07:36 +01:00
mn10300	Merge branch 'locking-arch-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2014-10-13 15:48:00 +02:00
openrisc	Merge git://git.infradead.org/users/eparis/audit	2014-10-19 16:25:56 -07:00
parisc	parisc: Avoid using CONFIG_64BIT in userspace exported headers	2014-11-10 22:25:29 +01:00
powerpc	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux	2014-11-04 11:18:29 -08:00
s390	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux	2014-11-05 12:13:52 -08:00
score	score: use Kbuild logic to include <asm-generic/sections.h>	2014-10-09 22:25:46 -04:00
sh	sh: fix sh770x SCIF memory regions	2014-10-29 16:33:15 -07:00
sparc	sparc64: Fix constraints on swab helpers.	2014-11-16 13:19:32 -08:00
tile	Merge branch 'for-3.18-consistent-ops' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu	2014-10-15 07:48:18 +02:00
um	Merge git://git.infradead.org/users/eparis/audit	2014-10-19 16:25:56 -07:00
unicore32	nosave: consolidate __nosave_{begin,end} in <asm/sections.h>	2014-10-09 22:26:04 -04:00
x86	Merge tag 'drm-intel-fixes-2014-11-19' into drm-intel-next-queued	2014-11-19 18:17:38 +01:00
xtensa	Xtensa improvements for 3.18:	2014-10-23 10:30:33 -07:00
.gitignore
Kconfig