David S. Miller 60747ef4d1 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Minor overlapping changes for both merge conflicts. Resolution work done by Stephen Rothwell was used as a reference. Signed-off-by: David S. Miller <davem@davemloft.net>		2016-08-18 01:17:32 -04:00
..
array.c	procfs: expose umask in /proc/<PID>/status	2016-05-20 17:58:30 -07:00
base.c	proc_oom_score: remove tasklist_lock and pid_alive()	2016-08-02 17:31:41 -04:00
cmdline.c
consoles.c
cpuinfo.c
devices.c
fd.c	switch all procfs directories ->iterate_shared()	2016-05-02 19:49:30 -04:00
fd.h
generic.c	proc: make proc entries inherit ownership from parent	2016-08-14 21:07:20 -07:00
inode.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace	2016-07-29 15:54:19 -07:00
internal.h	proc: Convert proc_mount to use mount_ns.	2016-06-23 15:41:54 -05:00
interrupts.c
Kconfig
kcore.c
kmsg.c
loadavg.c
Makefile	fs/proc: Add compiler check for -Wno-override-init to support gcc < 4.2	2016-08-03 12:45:23 -04:00
meminfo.c	proc, meminfo: use correct helpers for calculating LRU sizes in meminfo	2016-08-11 16:58:13 -07:00
namespaces.c	switch all procfs directories ->iterate_shared()	2016-05-02 19:49:30 -04:00
nommu.c
page.c	mm: rename _count, field of the struct page, to _refcount	2016-05-19 19:12:14 -07:00
proc_net.c	proc: make proc entries inherit ownership from parent	2016-08-14 21:07:20 -07:00
proc_sysctl.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-08-18 01:17:32 -04:00
proc_tty.c
root.c	proc: Convert proc_mount to use mount_ns.	2016-06-23 15:41:54 -05:00
self.c
softirqs.c
stat.c	procfs: avoid 32-bit time_t in /proc/*/stat	2016-08-02 17:31:41 -04:00
task_mmu.c	mm, rmap: account shmem thp pages	2016-07-26 16:19:19 -07:00
task_nommu.c
thread_self.c
uptime.c
version.c
vmcore.c	crash_dump: Add vmcore_elf32_check_arch	2016-05-13 14:01:59 +02:00