]> git.ipfire.org Git - thirdparty/nftables.git/commit
Merge branch 'master' into next-3.14
authorPatrick McHardy <kaber@trash.net>
Wed, 15 Jan 2014 11:55:39 +0000 (11:55 +0000)
committerPatrick McHardy <kaber@trash.net>
Wed, 15 Jan 2014 11:55:39 +0000 (11:55 +0000)
commitd232d30da84b333ca668e61d4cbcafe8dbc34ade
treea02b3778dd3f916e615a23d054d5481adbcac520
parenta4da57bde3330aa2d84815e16d8cf238cebf8d70
parent646dccd732b8d26484d5d07ff59d44a1770cf736
Merge branch 'master' into next-3.14

Signed-off-by: Patrick McHardy <kaber@trash.net>
Conflicts:
src/meta.c
src/parser.y
src/parser.y
src/scanner.l