Dave Airlie bdcddf95e8 Backmerge v4.1-rc4 into into drm-next ...

We picked up a silent conflict in amdkfd with drm-fixes and drm-next,
backmerge v4.1-rc5 and fix the conflicts

Signed-off-by: Dave Airlie <airlied@redhat.com>

Conflicts:
	drivers/gpu/drm/drm_irq.c

2015-05-20 16:23:53 +10:00

..

alpha

alpha: forward declare struct pt_regs in processor.h

2015-04-17 09:03:53 -04:00

arc

ARC: inline cache flush toggle helpers

2015-05-11 11:21:41 +05:30

arm

Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2015-05-16 15:33:25 -07:00

arm64

Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

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

Merge tag 'blackfin-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/realmz6/blackfin-linux

2015-04-24 07:58:07 -07:00

c6x

Merge tag 'for-linus' of git://linux-c6x.org/git/projects/linux-c6x-upstreaming

2015-04-16 18:48:55 -04:00

cris

Merge tag 'cris-for-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/jesper/cris

2015-04-26 13:31:05 -07:00

frv

Merge tag 'devicetree-for-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux

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

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

2015-04-26 17:22:07 -07: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

Merge tag 'metag-for-v4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag

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: tlb-r4k: Fix PG_ELPA comment

2015-05-15 22:02:50 +02:00

mn10300

Merge tag 'devicetree-for-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux

2015-04-24 08:46:18 -07:00

nios2

Merge tag 'nios2-v4.1-rc1' of git://git.rocketboards.org/linux-socfpga-next

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

powerpc/powernv: Restore non-volatile CRs after nap

2015-05-01 16:55:11 +10:00

s390

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

2015-04-28 09:58:46 -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

Backmerge v4.1-rc4 into into drm-next

2015-05-20 16:23:53 +10:00

xtensa

Merge tag 'xtensa-20150416' of git://github.com/czankel/xtensa-linux

2015-04-17 15:32:30 -04:00

.gitignore

…

Kconfig

Merge tag 'powerpc-4.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux

2015-04-16 13:53:32 -05:00