-
git://git.kernel.org/pub/scm/linux/kernel/git/davem/net由 David S. Miller 提交于
Conflict resolution of af_smc.c from Stephen Rothwell. Signed-off-by: NDavid S. Miller <davem@davemloft.net>6b0a7f84
Conflict resolution of af_smc.c from Stephen Rothwell.
Signed-off-by: NDavid S. Miller <davem@davemloft.net>