Kevin Hilman ecdf94da6f Linux 4.1-rc6 ... -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQEcBAABAgAGBQJVa7zvAAoJEHm+PkMAQRiGtfMIAILs3sxFtrC1hApgcfRLF/7z K34bwTRqErzqUO/orTwakEr9kSIpIL0zIPSryTCOTPZLfMGkQjhHXO3KR/DSbbTV MZ8y/BM/yelFA/Np+1LjbiYjTNRnTRvCoaQihkIH8Rn02g7ob9HyL4gIGKpuGFcZ 04GacL2cgChqsRSACdNef948jCoJXKgcuDpe39DXphDWZnBKNZ3HFuJ6bryGJf9A 1/eCI4is85BNwKPemQUYR0xx83UIzDfrghatZP2mOCDDSA2MNg8HNxLTd12LGoQD tfgX4B7aftzW9Y7GSEDfZ0IKm2NRzgPmCVj6PjVR/iI0lIK4Aq0Z/lDJxxEq3XQ= =AJM5 -----END PGP SIGNATURE----- Merge tag 'v4.1-rc6' into next/dt Linux 4.1-rc6 Conflicts: arch/arm/boot/dts/zynq-7000.dtsi Resolution summary: Mainline had an earlier version of the commit, resolve in favor of the newer patch in next/dt branch.		2015-06-11 14:37:45 -07: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	drm/radeon: add new bonaire pci id	2015-05-12 13:42:46 -04:00
dt-bindings	Samsung DT updates for v4.2	2015-06-11 14:31:55 -07:00
keys
kvm	KVM/ARM changes for v4.1:	2015-04-07 18:09:20 +02:00
linux	xfs: update for 4.1-rc6	2015-05-29 16:45:45 -07:00
math-emu
media	Merge branch 'patchwork' into v4l_for_linus	2015-04-21 06:12:35 -03:00
memory
misc
net	sctp: Fix mangled IPv4 addresses on a IPv6 listening socket	2015-05-27 14:15:26 -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	ASoC: Fixes for v4.1	2015-04-30 19:08:06 +02:00
target	target: Use a PASSTHROUGH flag instead of transport_types	2015-05-30 19:58:11 -07:00
trace	tracing/mm: don't trace mm_page_pcpu_drain on offline cpus	2015-05-28 18:25:18 -07:00
uapi	Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf	2015-05-16 16:40:22 -04:00
video	fbdev changes for v4.1	2015-04-20 15:16:25 -07:00
xen	xen/events: don't bind non-percpu VIRQs with percpu chip	2015-05-19 19:55:36 +01:00
Kbuild