summaryrefslogtreecommitdiff
path: root/net/ipx
ModeNameSize
-rw-r--r--Kconfig2778logplain
-rw-r--r--Makefile159logplain
-rw-r--r--af_ipx.c50811logplain
-rw-r--r--ipx_proc.c8114logplain
-rw-r--r--ipx_route.c6750logplain
-rw-r--r--pe2.c731logplain
-rw-r--r--sysctl_net_ipx.c919logplain
f5852e661d'>diff)
Merge branch 'stable/for-jens-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen into for-linus
Konrad writes: Please pull in your 'for-linus' branch two little fixes for Xen block front: One fix is for handling the XEN_PAGE_SIZE != PAGE_SIZE (4KB vs 64KB on ARM for example) mishandling while the other is fixing the accounting for the configuration changes.
Diffstat (limited to 'sound/oss/pss.c')