Merge branch 'x86-kaslr-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[karo-tx-linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 0d0108fea26f74f23e23bfd3a32c6f7fa5644c11..e8f8c3549684373be58be0f5de3753db8aea7ea2 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -90,6 +90,9 @@ Descriptions of section entries:
           F:   drivers/net/*   all files in drivers/net, but not below
           F:   */net/*         all files in "any top level directory"/net
           One pattern per line.  Multiple F: lines acceptable.
+       N: Files and directories with regex patterns.
+          N:   [^a-z]tegra     all files whose path contains the word tegra
+          One pattern per line.  Multiple N: lines acceptable.
        X: Files and directories that are NOT maintained, same rules as F:
           Files exclusions are tested before file matches.
           Can be useful for excluding a specific subdirectory, for instance:
@@ -97,13 +100,12 @@ Descriptions of section entries:
           X:   net/ipv6/
           matches all files in and below net excluding net/ipv6/
        K: Keyword perl extended regex pattern to match content in a
-          patch or file, or an affected filename.  For instance:
+          patch or file.  For instance:
           K: of_get_profile
-             matches patch or file content, or filenames, that contain
-             "of_get_profile"
+             matches patches or files that contain "of_get_profile"
           K: \b(printk|pr_(info|err))\b
-             matches patch or file content, or filenames, that contain one or
-             more of the words printk, pr_info or pr_err
+             matches patches or files that contain one or more of the words
+             printk, pr_info or pr_err
           One regex pattern per line.  Multiple K: lines acceptable.
 
 Note: For the hard of thinking, this list is meant to remain in alphabetical
@@ -2442,9 +2444,7 @@ S:        Maintained
 F:     drivers/platform/x86/dell-laptop.c
 
 DELL LAPTOP SMM DRIVER
-M:     Massimo Dal Zotto <dz@debian.org>
-W:     http://www.debian.org/~dz/i8k/
-S:     Maintained
+S:     Orphan
 F:     drivers/char/i8k.c
 F:     include/uapi/linux/i8k.h
 
@@ -7893,7 +7893,7 @@ L:        linux-tegra@vger.kernel.org
 Q:     http://patchwork.ozlabs.org/project/linux-tegra/list/
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra.git
 S:     Supported
-K:     (?i)[^a-z]tegra
+N:     [^a-z]tegra
 
 TEHUTI ETHERNET DRIVER
 M:     Andy Gospodarek <andy@greyhouse.net>
@@ -8379,9 +8379,10 @@ S:       Maintained
 F:     drivers/usb/serial/option.c
 
 USB PEGASUS DRIVER
-M:     Petko Manolov <petkan@users.sourceforge.net>
+M:     Petko Manolov <petkan@nucleusys.com>
 L:     linux-usb@vger.kernel.org
 L:     netdev@vger.kernel.org
+T:     git git://git.code.sf.net/p/pegasus2/git
 W:     http://pegasus2.sourceforge.net/
 S:     Maintained
 F:     drivers/net/usb/pegasus.*
@@ -8401,9 +8402,10 @@ S:       Supported
 F:     drivers/usb/class/usblp.c
 
 USB RTL8150 DRIVER
-M:     Petko Manolov <petkan@users.sourceforge.net>
+M:     Petko Manolov <petkan@nucleusys.com>
 L:     linux-usb@vger.kernel.org
 L:     netdev@vger.kernel.org
+T:     git git://git.code.sf.net/p/pegasus2/git
 W:     http://pegasus2.sourceforge.net/
 S:     Maintained
 F:     drivers/net/usb/rtl8150.c