Cleanup

Signed-off-by: Christoph Paasch <christoph.paasch@uclouvain.be>
Merge branch 'mptcp_trunk' into mptcp_ipext

Conflicts:
	net/mptcp/mptcp_ctrl.c

Signed-off-by: Christoph Paasch <christoph.paasch@uclouvain.be>
Merge branch 'mptcp_ipext' into mptcp_sockopt