David S. Miller 6b6cbc1471 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts were simply overlapping changes. In the net/ipv4/route.c case the code had simply moved around a little bit and the same fix was made in both 'net' and 'net-next'. In the net/sched/sch_generic.c case a fix in 'net' happened at the same time that a new argument was added to qdisc_hash_add(). Signed-off-by: David S. Miller <davem@davemloft.net>		2017-04-15 21:16:30 -04:00
..
alpha	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-04-15 21:16:30 -04:00
arc	ARC udpates for 4.11-rc5	2017-04-01 10:52:19 -07:00
arm	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-04-15 21:16:30 -04:00
arm64	Revert "Revert "arm64: hugetlb: partial revert of 66b3923a1a0f""	2017-04-07 12:27:29 +01:00
avr32	New getsockopt option to get socket cookie	2017-04-08 08:07:01 -07:00
blackfin	sched/headers: Move task->mm handling methods to <linux/sched/mm.h>	2017-03-03 01:43:28 +01:00
c6x	Merge branch 'regset' (PTRACE_SETREGSET data leakage)	2017-03-29 08:55:25 -07:00
cris	Merge branch 'prep-for-5level'	2017-03-10 08:59:07 -08:00
frv	New getsockopt option to get socket cookie	2017-04-08 08:07:01 -07:00
h8300	Merge branch 'regset' (PTRACE_SETREGSET data leakage)	2017-03-29 08:55:25 -07:00
hexagon	arch, mm: convert all architectures to use 5level-fixup.h	2017-03-09 11:48:47 -08:00
ia64	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-04-15 21:16:30 -04:00
m32r	New getsockopt option to get socket cookie	2017-04-08 08:07:01 -07:00
m68k	m68k: Wire up statx	2017-03-20 11:27:28 +01:00
metag	metag/usercopy: Fault handling fixes	2017-04-07 10:11:53 -07:00
microblaze	arch, mm: convert all architectures to use 5level-fixup.h	2017-03-09 11:48:47 -08:00
mips	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-04-15 21:16:30 -04:00
mn10300	New getsockopt option to get socket cookie	2017-04-08 08:07:01 -07:00
nios2	nios2: reserve boot memory for device tree	2017-04-02 20:13:57 -07:00
openrisc	openrisc: Export symbols needed by modules	2017-03-16 00:12:57 +09:00
parisc	New getsockopt option to get socket cookie	2017-04-08 08:07:01 -07:00
powerpc	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-04-15 21:16:30 -04:00
s390	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-04-15 21:16:30 -04:00
score	Fixup for arch/score after extable.h introduction	2017-03-11 14:16:50 -08:00
sh	Merge branch 'prep-for-5level'	2017-03-10 08:59:07 -08:00
sparc	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-04-15 21:16:30 -04:00
tile	arch, mm: convert all architectures to use 5level-fixup.h	2017-03-09 11:48:47 -08:00
um	arch, mm: convert all architectures to use 5level-fixup.h	2017-03-09 11:48:47 -08:00
unicore32	arch, mm: convert all architectures to use 5level-fixup.h	2017-03-09 11:48:47 -08:00
x86	Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2017-04-14 17:00:01 -07:00
xtensa	New getsockopt option to get socket cookie	2017-04-08 08:07:01 -07:00
.gitignore
Kconfig