mirror of
https://github.com/torvalds/linux.git
synced 2024-11-18 10:01:43 +00:00
6b0a7f84ea
Conflict resolution of af_smc.c from Stephen Rothwell. Signed-off-by: David S. Miller <davem@davemloft.net> |
||
---|---|---|
.. | ||
af_netlink.c | ||
af_netlink.h | ||
diag.c | ||
genetlink.c | ||
Kconfig | ||
Makefile |