David S. Miller 909b27f706 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... The nf_conntrack_core.c fix in 'net' is not relevant in 'net-next' because we no longer have a per-netns conntrack hash. The ip_gre.c conflict as well as the iwlwifi ones were cases of overlapping changes. Conflicts: drivers/net/wireless/intel/iwlwifi/mvm/tx.c net/ipv4/ip_gre.c net/netfilter/nf_conntrack_core.c Signed-off-by: David S. Miller <davem@davemloft.net>		2016-05-15 13:32:48 -04:00
..
alpha	alpha/extable: use generic search and sort routines	2016-03-22 15:36:02 -07:00
arc	ARC: support HIGHMEM even without PAE40	2016-05-05 16:35:46 +05:30
arm	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-05-15 13:32:48 -04:00
arm64	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-05-15 13:32:48 -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: memset: use the right constraint modifier for the %4 output operand	2016-04-27 16:35:55 +08:00
openrisc	arch, ftrace: for KASAN put hard/soft IRQ entries into separate sections	2016-03-25 16:37:42 -07:00
parisc	parisc: fix a bug when syscall number of tracee is __NR_Linux_syscalls	2016-05-06 15:09:07 +02:00
powerpc	powerpc fixes for 4.6 #4	2016-05-06 11:05:07 -07:00
s390	s390/mm: fix asce_bits handling with dynamic pagetable levels	2016-04-21 09:50:09 +02: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	sparc64: Fix bootup regressions on some Kconfig combinations.	2016-04-27 17:27:37 -04:00
tile	net: dsa: mv88e6xxx: factorize the switch driver	2016-05-09 14:26:13 -04:00
um	treewide: replace dev->trans_start update with helper	2016-05-04 14:16:49 -04: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 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2016-05-13 11:54:02 -07:00
xtensa	treewide: replace dev->trans_start update with helper	2016-05-04 14:16:49 -04:00
.gitignore
Kconfig	objtool: Add CONFIG_STACK_VALIDATION option	2016-02-29 08:35:13 +01:00