Daniel Vetter 0b076ecdf3 Merge remote-tracking branch 'airlied/drm-next' into HEAD ... Backmerge drm-next because the conflict between Ander's atomic fixes for 4.2 and Maartens future work are getting to unwielding to handle. Conflicts: drivers/gpu/drm/i915/intel_display.c drivers/gpu/drm/i915/intel_ringbuffer.h Just always take ours, same as git merge -X ours, but done by hand because I didn't trust git: It's confusing that it doesn't show any conflicts in the merge diff at all. Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>		2015-06-23 14:01:53 +02:00
..
alpha	alpha: kernel: osf_sys: Set 'kts.tv_nsec' only when 'tv' has effect	2015-05-26 10:01:51 -07:00
arc	ARC: inline cache flush toggle helpers	2015-05-11 11:21:41 +05:30
arm	ARM: dts: rename the clock of MIPI DSI 'pll_clk' to 'sclk_mipi'	2015-06-22 21:40:13 +09:00
arm64	ARM: SoC fixes for 4.1-rc3	2015-05-16 15:33:25 -07:00
avr32	Merge branch 'exec_domain_rip_v2' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/misc	2015-04-15 13:53:55 -07:00
blackfin	blackfin updates for Linux 4.1	2015-04-24 07:58:07 -07:00
c6x	C6X Fixes for v4.1	2015-04-16 18:48:55 -04:00
cris	CRIS changes for 4.1	2015-04-26 13:31:05 -07:00
frv	Devicetree updates for 4.1:	2015-04-24 08:46:18 -07:00
hexagon	Merge branch 'exec_domain_rip_v2' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/misc	2015-04-15 13:53:55 -07:00
ia64	PCI / ACPI: Do not set ACPI companions for host bridges with parents	2015-05-28 01:39:53 +02:00
m32r	m32r: make flush_cpumask non-volatile.	2015-05-09 11:09:29 -07:00
m68k	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu	2015-04-20 10:12:29 -07:00
metag	Metag architecture changes for v4.1	2015-04-24 07:56:50 -07:00
microblaze	microblaze: use asm-generic for seccomp.h	2015-04-17 09:04:10 -04:00
mips	MIPS: strnlen_user.S: Fix a CPU_DADDI_WORKAROUNDS regression	2015-05-29 20:23:58 +02:00
mn10300	Devicetree updates for 4.1:	2015-04-24 08:46:18 -07:00
nios2	nios2 update for v4.1-rc1	2015-04-24 07:59:07 -07:00
openrisc	Merge branch 'akpm' (patches from Andrew)	2015-04-15 16:39:15 -07:00
parisc	parisc,metag: Fix crashes due to stack randomization on stack-grows-upwards architectures	2015-05-12 22:03:44 +02:00
powerpc	This pull request includes a fix for two oopses, one on PPC	2015-05-21 20:15:16 -07:00
s390	Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6	2015-05-22 14:26:36 -07:00
score	arch: Remove exec_domain from remaining archs	2015-04-12 21:03:30 +02:00
sh	Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma	2015-04-24 09:49:37 -07:00
sparc	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc	2015-04-21 23:21:34 -07:00
tile	tile: properly use node_isset() on a nodemask_t	2015-04-28 10:36:45 -04:00
um	Merge branch 'exec_domain_rip_v2' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/misc	2015-04-15 13:53:55 -07:00
unicore32	Merge branch 'exec_domain_rip_v2' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/misc	2015-04-15 13:53:55 -07:00
x86	drm/i915: Remove KMS Kconfig option	2015-06-22 16:16:35 +02:00
xtensa	xtensa: Provide dummy dma_alloc_attrs() and dma_free_attrs()	2015-05-25 23:03:16 +00:00
.gitignore
Kconfig	powerpc updates for 4.1	2015-04-16 13:53:32 -05:00