David S. Miller c0cc53162a Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Minor overlapping changes in the conflicts. In the macsec case, the change of the default ID macro name overlapped with the 64-bit netlink attribute alignment fixes in net-next. Signed-off-by: David S. Miller <davem@davemloft.net>		2016-04-27 15:43:10 -04:00
..
alpha	alpha/extable: use generic search and sort routines	2016-03-22 15:36:02 -07:00
arc	ARC fixes for 4.6-rc4	2016-04-11 12:19:57 -07:00
arm	Here are the latest bug fixes for ARM SoCs, mostly addressing	2016-04-26 16:17:01 -07:00
arm64	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-04-27 15:43:10 -04:00
avr32	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2016-03-19 10:05:34 -07:00
blackfin	arch, ftrace: for KASAN put hard/soft IRQ entries into separate sections	2016-03-25 16:37:42 -07:00
c6x	arch, ftrace: for KASAN put hard/soft IRQ entries into separate sections	2016-03-25 16:37:42 -07:00
cris	Merge branch 'mm-pkeys-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2016-03-20 19:08:56 -07:00
frv	asm-generic changes for 4.6	2016-03-24 23:13:48 -07:00
h8300	h8300: switch EARLYCON	2016-03-25 01:45:19 +09:00
hexagon	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2016-03-19 10:05:34 -07:00
ia64	[IA64] Enable preadv2 and pwritev2 syscalls for ia64	2016-03-25 14:37:32 -07:00
m32r	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2016-03-19 10:05:34 -07:00
m68k	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu	2016-04-13 08:58:32 -07:00
metag	arch, ftrace: for KASAN put hard/soft IRQ entries into separate sections	2016-03-25 16:37:42 -07:00
microblaze	arch, ftrace: for KASAN put hard/soft IRQ entries into separate sections	2016-03-25 16:37:42 -07:00
mips	MIPS: traps.c: Verify the ISA for microMIPS RDHWR emulation	2016-04-04 15:25:34 +02:00
mn10300	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2016-03-19 10:05:34 -07:00
nios2	nios2: Replace fdt_translate_address with of_flat_dt_translate_address	2016-03-31 08:15:45 +08:00
openrisc	arch, ftrace: for KASAN put hard/soft IRQ entries into separate sections	2016-03-25 16:37:42 -07:00
parisc	Merge branch 'parisc-4.6-4' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux	2016-04-15 14:51:45 -07:00
powerpc	powerpc fixes for 4.6 #2	2016-04-22 10:53:12 -07:00
s390	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux	2016-04-18 10:13:31 -07:00
score	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2016-03-19 10:05:34 -07:00
sh	sh: fix function signature of cpu_coregroup_mask to match pointer type	2016-03-30 00:47:49 +00:00
sparc	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc	2016-03-28 15:14:11 -05:00
tile	Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile	2016-03-28 15:04:55 -05:00
um	fs/coredump: prevent fsuid=0 dumps into user-controlled directories	2016-03-22 15:36:02 -07:00
unicore32	Merge branch 'mm-pkeys-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2016-03-20 19:08:56 -07:00
x86	Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2016-04-23 12:07:29 -07:00
xtensa	Xtensa improvements for 4.6:	2016-03-20 12:22:07 -07:00
.gitignore	…
Kconfig	…