Conflicts: drivers/net/wireless/rtlwifi/pci.c include/linux/netlink.h |
||
|---|---|---|
| .. | ||
| Makefile | ||
| af_netlink.c | ||
| genetlink.c | ||
Conflicts: drivers/net/wireless/rtlwifi/pci.c include/linux/netlink.h |
||
|---|---|---|
| .. | ||
| Makefile | ||
| af_netlink.c | ||
| genetlink.c | ||