From: David S. Miller Date: Mon, 24 Jun 2013 19:43:40 +0000 (-0700) Subject: net: Restore unintentional reverts. X-Git-Tag: v3.11-rc1~64^2~163 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d3c5f47ee2d16497fafaf2f26b0ffeb5c3d4e721;p=pandora-kernel.git net: Restore unintentional reverts. This restores commits: c573972c111eb4c6b3f3250ad71e7c75cc799833 1a5904342c7380ceddd61c0b37544d752d0b1433 da2e2c214953f37c2a6be20226537ca5a329724c which initially accidently went into 'net', were reverted there, and then properly placed into 'net-next'. But the next net --> net-next merge accidently wiped them out again. Reported-by: Paul Gortmaker Signed-off-by: David S. Miller --- Reading git-diff-tree failed