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

Conflicts:
	Documentation/feature-removal-schedule.txt

Signed-off-by: Patrick McHardy <kaber@trash.net>