The patch 1 addesses a race on close which may possibly fix
issues/36 && issues/29, the 2nd patch is resolve conflicts and the 3rd one
is a follow-up cleanup.

Patch 3 should be inserted just after "mptcp: refactor token container."

v1 -> v2:
 - hopefully includes the correct patches

 protocol.c |    9 ++++---
 subflow.c  |   69 ++++++++++++++++++++++---------------------------------------
 2 files changed, 30 insertions(+), 48 deletions(-)