Merge branch 'ipset-6'

Conflicts:
	INSTALL
	mconfig
This commit is contained in:
Jan Engelhardt
2011-04-11 04:23:18 +02:00
80 changed files with 1446 additions and 1621 deletions

View File

@@ -22,7 +22,7 @@ Supported configurations for this release
- CONFIG_CONNECTOR y/m if you wish to receive userspace
notifications from pknock through netlink/connector
For ipset-5 you need:
For ipset-6 you need:
* libmnl