6b0a7f84ea
Conflict resolution of af_smc.c from Stephen Rothwell. Signed-off-by: David S. Miller <davem@davemloft.net> |
||
---|---|---|
.. | ||
capi | ||
divert | ||
gigaset | ||
hardware | ||
hisax | ||
hysdn | ||
i4l | ||
isdnloop | ||
mISDN | ||
Kconfig | ||
Makefile |