Merge branch 'akpm' (patches from Andrew)

[mirror_ubuntu-artful-kernel.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index e773ad5446e35b7a56112e400bee9c93cbb5bf69..88315cfcfb3978dbc0061475ee893e0065481ee3 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -74,6 +74,10 @@ Descriptions of section entries:
           These reviewers should be CCed on patches.
        L: Mailing list that is relevant to this area
        W: Web-page with status/info
+       B: URI for where to file bugs. A web-page with detailed bug
+          filing info, a direct bug tracker link, or a mailto: URI.
+       C: URI for chat protocol, server and channel where developers
+          usually hang out, for example irc://server/channel.
        Q: Patchwork web based patch tracking system site
        T: SCM tree type and location.
           Type is one of: git, hg, quilt, stgit, topgit
@@ -577,6 +581,11 @@ T: git git://linuxtv.org/anttip/media_tree.git
 S:     Maintained
 F:     drivers/media/usb/airspy/
 
+ALACRITECH GIGABIT ETHERNET DRIVER
+M:     Lino Sanfilippo <LinoSanfilippo@gmx.de>
+S:     Maintained
+F:     drivers/net/ethernet/alacritech/*
+
 ALCATEL SPEEDTOUCH USB DRIVER
 M:     Duncan Sands <duncan.sands@free.fr>
 L:     linux-usb@vger.kernel.org
@@ -4019,6 +4028,8 @@ DRM DRIVERS
 M:     David Airlie <airlied@linux.ie>
 L:     dri-devel@lists.freedesktop.org
 T:     git git://people.freedesktop.org/~airlied/linux
+B:     https://bugs.freedesktop.org/
+C:     irc://chat.freenode.net/dri-devel
 S:     Maintained
 F:     drivers/gpu/drm/
 F:     drivers/gpu/vga/
@@ -4071,6 +4082,8 @@ M:        Jani Nikula <jani.nikula@linux.intel.com>
 L:     intel-gfx@lists.freedesktop.org
 L:     dri-devel@lists.freedesktop.org
 W:     https://01.org/linuxgraphics/
+B:     https://01.org/linuxgraphics/documentation/how-report-bugs
+C:     irc://chat.freenode.net/intel-gfx
 Q:     http://patchwork.freedesktop.org/project/intel-gfx/
 T:     git git://anongit.freedesktop.org/drm-intel
 S:     Supported
@@ -4640,12 +4653,14 @@ L:      linux-efi@vger.kernel.org
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git
 S:     Maintained
 F:     Documentation/efi-stub.txt
-F:     arch/ia64/kernel/efi.c
+F:     arch/*/kernel/efi.c
 F:     arch/x86/boot/compressed/eboot.[ch]
-F:     arch/x86/include/asm/efi.h
+F:     arch/*/include/asm/efi.h
 F:     arch/x86/platform/efi/
 F:     drivers/firmware/efi/
 F:     include/linux/efi*.h
+F:     arch/arm/boot/compressed/efi-header.S
+F:     arch/arm64/kernel/efi-entry.S
 
 EFI VARIABLE FILESYSTEM
 M:     Matthew Garrett <matthew.garrett@nebula.com>
@@ -6097,14 +6112,9 @@ S:       Maintained
 F:     Documentation/cdrom/ide-cd
 F:     drivers/ide/ide-cd*
 
-IDLE-I7300
-M:     Andy Henroid <andrew.d.henroid@intel.com>
-L:     linux-pm@vger.kernel.org
-S:     Supported
-F:     drivers/idle/i7300_idle.c
-
 IEEE 802.15.4 SUBSYSTEM
 M:     Alexander Aring <aar@pengutronix.de>
+M:     Stefan Schmidt <stefan@osg.samsung.com>
 L:     linux-wpan@vger.kernel.org
 W:     http://wpan.cakelab.org/
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth.git
@@ -8971,9 +8981,11 @@ F:       drivers/of/resolver.c
 
 OPENRISC ARCHITECTURE
 M:     Jonas Bonn <jonas@southpole.se>
-W:     http://openrisc.net
+M:     Stefan Kristiansson <stefan.kristiansson@saunalahti.fi>
+M:     Stafford Horne <shorne@gmail.com>
+L:     openrisc@lists.librecores.org
+W:     http://openrisc.io
 S:     Maintained
-T:     git git://openrisc.net/~jonas/linux
 F:     arch/openrisc/
 
 OPENVSWITCH