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

..

acpi

ACPICA: remove duplicate u8 typedef

2015-04-28 23:58:54 +02:00

asm-generic

Merge tag 'tty-4.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty

2015-04-21 09:33:10 -07:00

clocksource

…

crypto

…

drm

Backmerge v4.1-rc4 into into drm-next

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

dt-bindings

Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma

2015-04-24 09:49:37 -07:00

keys

…

kvm

…

linux

Merge tag 'tty-4.1-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty

2015-05-16 21:10:05 -07:00

math-emu

…

media

Merge branch 'patchwork' into v4l_for_linus

2015-04-21 06:12:35 -03:00

memory

…

misc

…

net

Merge tag 'mac80211-for-davem-2015-05-04' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211

2015-05-04 16:00:55 -04:00

pcmcia

…

ras

…

rdma

IB/core: Fix unaligned accesses

2015-05-05 13:21:27 -04:00

rxrpc

…

scsi

SCSI: add 1024 max sectors black list flag

2015-04-27 09:38:06 -07:00

soc

…

sound

Merge tag 'asoc-v4.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus

2015-04-30 19:08:06 +02:00

target

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending

2015-04-24 10:22:09 -07:00

trace

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

2015-04-26 17:22:07 -07:00

uapi

Backmerge v4.1-rc4 into into drm-next

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

video

Merge tag 'fbdev-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux

2015-04-20 15:16:25 -07:00

xen

xen: Suspend ticks on all CPUs during suspend

2015-04-29 17:10:05 +01:00

Kbuild

…