David S. Miller 0b42f25d2f Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... udplite conflict is resolved by taking what 'net-next' did which removed the backlog receive method assignment, since it is no longer necessary. Two entries were added to the non-priv ethtool operations switch statement, one in 'net' and one in 'net-next, so simple overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2016-11-26 23:42:21 -05:00
..
calibrate.c
do_mounts_initrd.c
do_mounts_md.c
do_mounts_rd.c	init: use pr_cont() when displaying rotator during ramdisk loading.	2016-11-24 09:32:20 -08:00
do_mounts.c
do_mounts.h
init_task.c	sched/core: Allow putting thread_info into task_struct	2016-09-15 08:25:13 +02:00
initramfs.c
Kconfig	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-11-26 23:42:21 -05:00
main.c	gcc-plugins: Add latent_entropy plugin	2016-10-10 14:51:44 -07:00
Makefile	kbuild: allow archs to select link dead code/data elimination	2016-09-09 10:47:00 +02:00
noinitramfs.c
version.c