Skip to content
Snippets Groups Projects
Commit 6b0a7f84 authored by David S. Miller's avatar David S. Miller
Browse files

Conflict resolution of af_smc.c from Stephen Rothwell.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents cea0aa9c fe5cdef2
No related branches found
No related tags found
Loading
Showing
with 338 additions and 63 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment