From: Arnaldo Carvalho de Melo <acme@kernel.org>
Date: Mon, 21 Jul 2014 16:21:31 -0300

	Trying to get this merged, finally. I has whas has been
discussed so far and agreed wrt the timeout handling.

This gets lots of rejects against the current 'net' tree.

Please respin and integrate Remi's Acked-by, thanks.