Skip to content
Commit 1e4b1057 authored by Patrick McHardy's avatar Patrick McHardy
Browse files

Merge branch 'master' of /repos/git/net-next-2.6 



Conflicts:
	net/bridge/br_device.c
	net/bridge/br_forward.c

Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
parents 3b254c54 3ee94372
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