d31e95585c
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 | ||
| caif_dev.c | ||
| caif_socket.c | ||
| caif_usb.c | ||
| cfcnfg.c | ||
| cfctrl.c | ||
| cfdbgl.c | ||
| cfdgml.c | ||
| cffrml.c | ||
| cfmuxl.c | ||
| cfpkt_skbuff.c | ||
| cfrfml.c | ||
| cfserl.c | ||
| cfsrvl.c | ||
| cfutill.c | ||
| cfveil.c | ||
| cfvidl.c | ||
| chnl_net.c | ||