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
..
Kconfig	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-11-26 23:42:21 -05:00
Makefile	kbuild: allow archs to select link dead code/data elimination	2016-09-09 10:47:00 +02:00
calibrate.c	kernel: add calibration_delay_done()	2014-06-16 12:47:39 -06:00
do_mounts.c	init/do_mounts.c: add create_dev() failure log	2015-06-25 17:00:42 -07:00
do_mounts.h	init/do_mounts: initrd_load() can be boolean	2016-01-20 17:09:18 -08:00
do_mounts_initrd.c	init/do_mounts: initrd_load() can be boolean	2016-01-20 17:09:18 -08:00
do_mounts_md.c	init: disable sparse checking of the mount.o source files	2012-05-31 17:49:27 -07:00
do_mounts_rd.c	init: use pr_cont() when displaying rotator during ramdisk loading.	2016-11-24 09:32:20 -08:00
init_task.c	sched/core: Allow putting thread_info into task_struct	2016-09-15 08:25:13 +02:00
initramfs.c	kexec: split kexec_load syscall from kexec core code	2015-09-10 13:29:01 -07:00
main.c	gcc-plugins: Add latent_entropy plugin	2016-10-10 14:51:44 -07:00
noinitramfs.c	init: mark __user address space on string literals	2010-10-26 16:52:15 -07:00
version.c	copy address of proc_ns_ops into ns_common	2014-12-04 14:34:47 -05:00