Skip to content
Commit 82d800d8 authored by Patrick McHardy's avatar Patrick McHardy
Browse files

Merge branch 'connlimit' of git://dev.medozas.de/linux 



Conflicts:
	Documentation/feature-removal-schedule.txt

Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
parents 28a51ba5 cc4fc022
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