mei: fix an && vs || typo

[linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 2d0773007c89b313406465dca89fd3e6a92d329d..76cd525b56fe0cac99ee7a462377b537f54511ea 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3398,8 +3398,8 @@ M:        Arnd Bergmann <arnd@arndb.de>
 M:     Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git
 S:     Supported
-F:     drivers/char/*
-F:     drivers/misc/*
+F:     drivers/char/
+F:     drivers/misc/
 F:     include/linux/miscdevice.h
 
 CHECKPATCH
@@ -12460,6 +12460,13 @@ F:     lib/siphash.c
 F:     lib/test_siphash.c
 F:     include/linux/siphash.h
 
+SIOX
+M:     Gavin Schenk <g.schenk@eckelmann.de>
+M:     Uwe Kleine-König <kernel@pengutronix.de>
+S:     Supported
+F:     drivers/siox/*
+F:     include/trace/events/siox.h
+
 SIS 190 ETHERNET DRIVER
 M:     Francois Romieu <romieu@fr.zoreil.com>
 L:     netdev@vger.kernel.org
@@ -12511,6 +12518,14 @@ T:     git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git
 F:     include/linux/srcu.h
 F:     kernel/rcu/srcu.c
 
+SERIAL LOW-POWER INTER-CHIP MEDIA BUS (SLIMbus)
+M:     Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
+L:     alsa-devel@alsa-project.org (moderated for non-subscribers)
+S:     Maintained
+F:     drivers/slimbus/
+F:     Documentation/devicetree/bindings/slimbus/
+F:     include/linux/slimbus.h
+
 SMACK SECURITY MODULE
 M:     Casey Schaufler <casey@schaufler-ca.com>
 L:     linux-security-module@vger.kernel.org
@@ -12714,6 +12729,16 @@ F:     Documentation/sound/alsa/soc/
 F:     sound/soc/
 F:     include/sound/soc*
 
+SOUNDWIRE SUBSYSTEM
+M:     Vinod Koul <vinod.koul@intel.com>
+M:     Sanyog Kale <sanyog.r.kale@intel.com>
+R:     Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
+L:     alsa-devel@alsa-project.org (moderated for non-subscribers)
+S:     Supported
+F:     Documentation/driver-api/soundwire/
+F:     drivers/soundwire/
+F:     include/linux/soundwire/
+
 SP2 MEDIA DRIVER
 M:     Olli Salonen <olli.salonen@iki.fi>
 L:     linux-media@vger.kernel.org
@@ -13491,6 +13516,7 @@ M:      Mika Westerberg <mika.westerberg@linux.intel.com>
 M:     Yehezkel Bernat <yehezkel.bernat@intel.com>
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git
 S:     Maintained
+F:     Documentation/admin-guide/thunderbolt.rst
 F:     drivers/thunderbolt/
 F:     include/linux/thunderbolt.h
 
@@ -14556,6 +14582,15 @@ S:     Maintained
 F:     drivers/virtio/virtio_input.c
 F:     include/uapi/linux/virtio_input.h
 
+VIRTUAL BOX GUEST DEVICE DRIVER
+M:     Hans de Goede <hdegoede@redhat.com>
+M:     Arnd Bergmann <arnd@arndb.de>
+M:     Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+S:     Maintained
+F:     include/linux/vbox_utils.h
+F:     include/uapi/linux/vbox*.h
+F:     drivers/virt/vboxguest/
+
 VIRTUAL SERIO DEVICE DRIVER
 M:     Stephen Chandler Paul <thatslyude@gmail.com>
 S:     Maintained