Skip to content
Commit 88c5100c authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'master' of github.com:davem330/net 

Conflicts:
	net/batman-adv/soft-interface.c
parents 8083f0fc 3ee72ca9
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment