From: Patrick McHardy <kaber@trash.net>
Date: Fri, 10 Jan 2014 12:26:35 +0000 (+0000)
Subject: Merge remote-tracking branch 'origin/master' into next-3.14
X-Git-Tag: v0.2~69
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3f8820318302da097795ba7d8b2ae3f6dff6cf2e;p=thirdparty%2Fnftables.git

Merge remote-tracking branch 'origin/master' into next-3.14
---

3f8820318302da097795ba7d8b2ae3f6dff6cf2e