]> git.ipfire.org Git - thirdparty/iptables.git/commitdiff
projects / thirdparty / iptables.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 06d14d7 a40cd9b)
Merge branch 'ipset-next'
authorPablo Neira Ayuso <pablo@netfilter.org>
Tue, 28 Apr 2015 12:09:07 +0000 (14:09 +0200)
committerPablo Neira Ayuso <pablo@netfilter.org>
Tue, 28 Apr 2015 12:09:46 +0000 (14:09 +0200)
Get this patch into master:

"Alignment problem between 64bit kernel 32bit userspace"

As Jozsef requests.


Trivial merge
Mirror of git://git.netfilter.org/iptables