mirror of https://github.com/torvalds/linux.git
The only slightly tricky merge conflict was the netdevsim because the mutex locking fix overlapped a lot of driver reload reorganization. The rest were (relatively) trivial in nature. Signed-off-by: David S. Miller <davem@davemloft.net> |
||
|---|---|---|
| .. | ||
| Kconfig | ||
| Makefile | ||
| af_unix.c | ||
| diag.c | ||
| garbage.c | ||
| scm.c | ||
| scm.h | ||
| sysctl_net_unix.c | ||