diff options
| author | David S. Miller <davem@davemloft.net> | 2013-02-18 23:42:09 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-02-18 23:42:09 -0500 |
| commit | 2ccba5433ba567046e49643eb21502d5ea91dc83 (patch) | |
| tree | 7297a374160c7785ebc39534d86a175b9c760c8c /net/mac80211/offchannel.c | |
| parent | 6338a53a2bd02d5878ab449371323364b7cc7694 (diff) | |
| parent | b20ab9cc63ca4605aec154cf54faa8455749f3f6 (diff) | |
Merge branch 'master' of git://1984.lsi.us.es/nf-next
Pablo Neira Ayuso says:
====================
The following patchset contain updates for your net-next tree, they are:
* Fix (for just added) connlabel dependencies, from Florian Westphal.
* Add aliasing support for conntrack, thus users can either use -m state
or -m conntrack from iptables while using the same kernel module, from
Jozsef Kadlecsik.
* Some code refactoring for the CT target to merge common code in
revision 0 and 1, from myself.
* Add aliasing support for CT, based on patch from Jozsef Kadlecsik.
* Add one mutex per nfnetlink subsystem, from myself.
* Improved logging for packets that are dropped by helpers, from myself.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/mac80211/offchannel.c')
0 files changed, 0 insertions, 0 deletions