diff --git a/[refs] b/[refs] index aef3053b3f5f..c9b236600632 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fd3858554b62c3af6b7664b5c58ad864c87116c9 +refs/heads/master: 4cc6773508299377099aa30cf30e6a2196c5872d diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 16af51ba44a5..23348c0d37bc 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -2031,6 +2031,13 @@ L: netfilter@lists.netfilter.org L: netfilter-devel@lists.netfilter.org S: Supported +NETLABEL +P: Paul Moore +M: paul.moore@hp.com +W: http://netlabel.sf.net +L: netdev@vger.kernel.org +S: Supported + NETROM NETWORK LAYER P: Ralf Baechle M: ralf@linux-mips.org diff --git a/trunk/net/netlabel/Kconfig b/trunk/net/netlabel/Kconfig index fe23cb7f1e87..9f7121ae13e9 100644 --- a/trunk/net/netlabel/Kconfig +++ b/trunk/net/netlabel/Kconfig @@ -9,6 +9,9 @@ config NETLABEL ---help--- NetLabel provides support for explicit network packet labeling protocols such as CIPSO and RIPSO. For more information see - Documentation/netlabel. + Documentation/netlabel as well as the NetLabel SourceForge project + for configuration tools and additional documentation. + + * http://netlabel.sf.net If you are unsure, say N.