Dave Airlie bdcddf95e8 Linux 4.1-rc4 ... -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQEcBAABAgAGBQJVWh3TAAoJEHm+PkMAQRiG/kwH/2c9irodp2+M9OUnX2bfsBb6 LnChiDpvkF5BB8jhP6d/XmvPp4NJzAbTxByhjdfb2E2HkorCUHCOIn2tI1TE2pUs 2qjkOVH+XCzoV0goGtQjzK1ht8f2IrtlDiEjyRekK5cJHzhggb22QPtWL4npyd0O reDmG2jsRaF9POr9uLSFEv4CEnkksmRLUU0vuQX0TZeCJ41O7TXrkN/wKrLZ5mj4 IWpqXQaSlrffq/T5HnVbXBxk3/T8QmhrIoppiMpV1mUVj0uTqlFRNi5qwT2Nit1h FVljWI4+WgOk3bf7fUlp+ahopjkTgu+GuXkiRP/pdgWNQO0cxCWSAzSndAlIIAE= =uOoJ -----END PGP SIGNATURE----- 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	TTY/Serial patches for 4.1-rc1	2015-04-21 09:33:10 -07:00
clocksource
crypto	Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6	2015-04-15 10:42:15 -07:00
drm	Linux 4.1-rc4	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	KVM/ARM changes for v4.1:	2015-04-07 18:09:20 +02:00
linux	TTY/Serial fixes for 4.1-rc4	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	We have only a few fixes right now:	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	RxRPC: Handle VERSION Rx protocol packets	2015-04-01 16:31:26 +01:00
scsi	SCSI: add 1024 max sectors black list flag	2015-04-27 09:38:06 -07:00
soc
sound	ASoC: Fixes for v4.1	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	Linux 4.1-rc4	2015-05-20 16:23:53 +10:00
video	fbdev changes for v4.1	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