projects / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: f6ae9f1 b6520fc)
Merge branch 'master' of git://blackhole.kfki.hu/nf-next
authorPablo Neira Ayuso <pablo@netfilter.org>
Wed, 13 Nov 2019 09:42:07 +0000 (10:42 +0100)
committerPablo Neira Ayuso <pablo@netfilter.org>
Wed, 13 Nov 2019 09:42:07 +0000 (10:42 +0100)
commit3944a4fd0d7015523d55e50fdaa40d12523f2e6a
tree9a706003b1de45722d5219461fcff844fd6de6e8tree | snapshot
parentf6ae9f120dada00abfb47313364c35118469455fcommit | diff
parentb6520fce073b619e6f2c0d510bb3481c9386c70bcommit | diff
Merge branch 'master' of git://blackhole.kfki.hu/nf-next

Jozsef Kadlecsik says:

====================
ipset patches for nf-next

- Add wildcard support to hash:net,iface which makes possible to
  match interface prefixes besides complete interfaces names, from
  Kristian Evensen.
====================

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
ep93xx device tree rework repo: git://git.maquefel.me/linux.git