Learn more about cloning repositories
You have read-only access
Merge branch 'master' of github.com:davem330/net Conflicts: net/batman-adv/soft-interface.c
