Daniel Vetter ca6e440577 Merge tag 'drm-intel-fixes-2015-07-15' into drm-intel-next-queued ... Backmerge fixes since it's getting out of hand again with the massive split due to atomic between -next and 4.2-rc. All the bugfixes in 4.2-rc are addressed already (by converting more towards atomic instead of minimal duct-tape) so just always pick the version in next for the conflicts in modeset code. All the other conflicts are just adjacent lines changed. Conflicts: drivers/gpu/drm/i915/i915_drv.h drivers/gpu/drm/i915/i915_gem_gtt.c drivers/gpu/drm/i915/intel_display.c drivers/gpu/drm/i915/intel_drv.h drivers/gpu/drm/i915/intel_ringbuffer.h Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>		2015-07-15 16:36:50 +02:00
..
alpha	TTY/Serial driver patches for 4.2-rc1	2015-06-26 15:53:22 -07:00
arc	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2015-07-04 19:36:06 -07:00
arm	ARM: SoC: fixes for v4.2-rc2	2015-07-11 10:20:36 -07:00
arm64	ARM: SoC: fixes for v4.2-rc2	2015-07-11 10:20:36 -07:00
avr32	Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2015-07-01 15:19:35 -07:00
blackfin	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2015-07-04 19:36:06 -07:00
c6x	Merge branch 'for-4.2/sg' of git://git.kernel.dk/linux-block	2015-06-25 15:22:36 -07:00
cris	cris: Replace do_posix_clock_monotonic_gettime()	2015-07-09 10:51:46 +02:00
frv	Fix up implicit <module.h> users that will break later.	2015-07-02 10:25:22 -07:00
h8300	h8300: Always build dtb	2015-06-23 13:36:00 +09:00
hexagon	Merge branch 'for-4.2/sg' of git://git.kernel.dk/linux-block	2015-06-25 15:22:36 -07:00
ia64	remove some boot noise from a now-invalid check that pages are reserved	2015-07-02 14:46:15 -07:00
m32r	Merge branch 'for-4.2/sg' of git://git.kernel.dk/linux-block	2015-06-25 15:22:36 -07:00
m68k	Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2015-07-01 15:19:35 -07:00
metag	Merge branch 'akpm' (patches from Andrew)	2015-06-26 09:52:05 -07:00
microblaze	Merge branch 'for-4.2/sg' of git://git.kernel.dk/linux-block	2015-06-25 15:22:36 -07:00
mips	MIPS: O32: Use compat_sys_getsockopt.	2015-07-10 11:02:22 +02:00
mn10300	Replace module_init with equivalent device_initcall in non modules.	2015-07-02 10:30:48 -07:00
nios2	nios2 update for v4.2	2015-07-03 12:22:49 -07:00
openrisc	Merge branch 'for-4.2/sg' of git://git.kernel.dk/linux-block	2015-06-25 15:22:36 -07:00
parisc	parisc: Fix some PTE/TLB race conditions and optimize __flush_tlb_range based on timing results	2015-07-10 21:47:47 +02:00
powerpc	powerpc/perf/24x7: Fix lockdep warning	2015-07-08 15:18:04 +10:00
s390	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2015-07-04 19:36:06 -07:00
score	Merge branch 'for-4.2/sg' of git://git.kernel.dk/linux-block	2015-06-25 15:22:36 -07:00
sh	Replace module_init with equivalent device_initcall in non modules.	2015-07-02 10:30:48 -07:00
sparc	Merge branch 'akpm' (patches from Andrew)	2015-06-26 09:52:05 -07:00
tile	modpost: work correctly with tile coldtext sections	2015-07-08 18:53:49 -04:00
um	Minor merge needed, due to function move.	2015-07-01 10:49:25 -07:00
unicore32	arch/unicore32/kernel/fpu-ucf64.c: remove unnecessary KERN_ERR	2015-06-30 19:44:59 -07:00
x86	Merge tag 'drm-intel-fixes-2015-07-15' into drm-intel-next-queued	2015-07-15 16:36:50 +02:00
xtensa	Replace module_init with equivalent device_initcall in non modules.	2015-07-02 10:30:48 -07:00
.gitignore
Kconfig	clone: support passing tls argument via C rather than pt_regs magic	2015-06-25 17:00:38 -07:00