projects / cascardo / linux.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
s390/cio: ensure consistent measurement state
[cascardo/linux.git] / MAINTAINERS
diff --git a/MAINTAINERS b/MAINTAINERS
index 0788854..95eafcc 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -240,6 +240,12 @@ L: lm-sensors@lm-sensors.org
 S:     Maintained
 F:     drivers/hwmon/abituguru3.c
 
+ACCES 104-IDI-48 GPIO DRIVER
+M:     "William Breathitt Gray" <vilhelm.gray@gmail.com>
+L:     linux-gpio@vger.kernel.org
+S:     Maintained
+F:     drivers/gpio/gpio-104-idi-48.c
+
 ACCES 104-IDIO-16 GPIO DRIVER
 M:     "William Breathitt Gray" <vilhelm.gray@gmail.com>
 L:     linux-gpio@vger.kernel.org
@@ -371,6 +377,15 @@ ADDRESS SPACE LAYOUT RANDOMIZATION (ASLR)
 M:     Jiri Kosina <jikos@kernel.org>
 S:     Maintained
 
+ADF7242 IEEE 802.15.4 RADIO DRIVER
+M:     Michael Hennerich <michael.hennerich@analog.com>
+W:     https://wiki.analog.com/ADF7242
+W:     http://ez.analog.com/community/linux-device-drivers
+L:     linux-wpan@vger.kernel.org
+S:     Supported
+F:     drivers/net/ieee802154/adf7242.c
+F:     Documentation/devicetree/bindings/net/ieee802154/adf7242.txt
+
 ADM1025 HARDWARE MONITOR DRIVER
 M:     Jean Delvare <jdelvare@suse.com>
 L:     lm-sensors@lm-sensors.org
@@ -388,7 +403,7 @@ ADM8211 WIRELESS DRIVER
 L:     linux-wireless@vger.kernel.org
 W:     http://wireless.kernel.org/
 S:     Orphan
-F:     drivers/net/wireless/adm8211.*
+F:     drivers/net/wireless/admtek/adm8211.*
 
 ADP1653 FLASH CONTROLLER DRIVER
 M:     Sakari Ailus <sakari.ailus@iki.fi>
@@ -1992,7 +2007,7 @@ L:        linux-wireless@vger.kernel.org
 W:     http://www.thekelleys.org.uk/atmel
 W:     http://atmelwlandriver.sourceforge.net/
 S:     Maintained
-F:     drivers/net/wireless/atmel*
+F:     drivers/net/wireless/atmel/atmel*
 
 ATMEL MAXTOUCH DRIVER
 M:     Nick Dyer <nick.dyer@itdev.co.uk>
@@ -2081,7 +2096,7 @@ L:        linux-wireless@vger.kernel.org
 L:     b43-dev@lists.infradead.org
 W:     http://wireless.kernel.org/en/users/Drivers/b43
 S:     Odd Fixes
-F:     drivers/net/wireless/b43/
+F:     drivers/net/wireless/broadcom/b43/
 
 B43LEGACY WIRELESS DRIVER
 M:     Larry Finger <Larry.Finger@lwfinger.net>
@@ -2089,7 +2104,7 @@ L:        linux-wireless@vger.kernel.org
 L:     b43-dev@lists.infradead.org
 W:     http://wireless.kernel.org/en/users/Drivers/b43
 S:     Maintained
-F:     drivers/net/wireless/b43legacy/
+F:     drivers/net/wireless/broadcom/b43legacy/
 
 BACKLIGHT CLASS/SUBSYSTEM
 M:     Jingoo Han <jingoohan1@gmail.com>
@@ -2101,7 +2116,7 @@ F:        include/linux/backlight.h
 BATMAN ADVANCED
 M:     Marek Lindner <mareklindner@neomailbox.ch>
 M:     Simon Wunderlich <sw@simonwunderlich.de>
-M:     Antonio Quartulli <antonio@meshcoding.com>
+M:     Antonio Quartulli <a@unstable.cc>
 L:     b.a.t.m.a.n@lists.open-mesh.org
 W:     http://www.open-mesh.org/
 S:     Maintained
@@ -2391,7 +2406,7 @@ M:        Hante Meuleman <meuleman@broadcom.com>
 L:     linux-wireless@vger.kernel.org
 L:     brcm80211-dev-list@broadcom.com
 S:     Supported
-F:     drivers/net/wireless/brcm80211/
+F:     drivers/net/wireless/broadcom/brcm80211/
 
 BROADCOM BNX2FC 10 GIGABIT FCOE DRIVER
 M:     QLogic-Storage-Upstream@qlogic.com
@@ -2758,7 +2773,7 @@ S:        Maintained
 F:     Documentation/zh_CN/
 
 CHIPIDEA USB HIGH SPEED DUAL ROLE CONTROLLER
-M:     Peter Chen <Peter.Chen@freescale.com>
+M:     Peter Chen <Peter.Chen@nxp.com>
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git
 L:     linux-usb@vger.kernel.org
 S:     Maintained
@@ -3113,7 +3128,7 @@ F:        sound/pci/cs5535audio/
 CW1200 WLAN driver
 M:     Solomon Peachy <pizza@shaftnet.org>
 S:     Maintained
-F:     drivers/net/wireless/cw1200/
+F:     drivers/net/wireless/st/cw1200/
 
 CX18 VIDEO4LINUX DRIVER
 M:     Andy Walls <awalls@md.metrocast.net>
@@ -3753,6 +3768,15 @@ S:       Maintained
 F:     drivers/gpu/drm/sti
 F:     Documentation/devicetree/bindings/display/st,stih4xx.txt
 
+DRM DRIVERS FOR VIVANTE GPU IP
+M:     Lucas Stach <l.stach@pengutronix.de>
+R:     Russell King <linux+etnaviv@arm.linux.org.uk>
+R:     Christian Gmeiner <christian.gmeiner@gmail.com>
+L:     dri-devel@lists.freedesktop.org
+S:     Maintained
+F:     drivers/gpu/drm/etnaviv
+F:     Documentation/devicetree/bindings/display/etnaviv
+
 DSBR100 USB FM RADIO DRIVER
 M:     Alexey Klimov <klimov.linux@gmail.com>
 L:     linux-media@vger.kernel.org
@@ -4481,8 +4505,9 @@ F:        include/linux/fs_enet_pd.h
 FREESCALE QUICC ENGINE LIBRARY
 L:     linuxppc-dev@lists.ozlabs.org
 S:     Orphan
-F:     arch/powerpc/sysdev/qe_lib/
-F:     arch/powerpc/include/asm/*qe.h
+F:     drivers/soc/fsl/qe/
+F:     include/soc/fsl/*qe*.h
+F:     include/soc/fsl/*ucc*.h
 
 FREESCALE USB PERIPHERAL DRIVERS
 M:     Li Yang <leoli@freescale.com>
@@ -4975,6 +5000,7 @@ F:        arch/*/include/asm/suspend*.h
 
 HID CORE LAYER
 M:     Jiri Kosina <jikos@kernel.org>
+R:     Benjamin Tissoires <benjamin.tissoires@redhat.com>
 L:     linux-input@vger.kernel.org
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid.git
 S:     Maintained
@@ -5029,13 +5055,20 @@ F:      include/uapi/linux/if_hippi.h
 F:     net/802/hippi.c
 F:     drivers/net/hippi/
 
+HISILICON SAS Controller
+M:     John Garry <john.garry@huawei.com>
+W:     http://www.hisilicon.com
+S:     Supported
+F:     drivers/scsi/hisi_sas/
+F:     Documentation/devicetree/bindings/scsi/hisilicon-sas.txt
+
 HOST AP DRIVER
 M:     Jouni Malinen <j@w1.fi>
 L:     hostap@shmoo.com (subscribers-only)
 L:     linux-wireless@vger.kernel.org
 W:     http://hostap.epitest.fi/
 S:     Maintained
-F:     drivers/net/wireless/hostap/
+F:     drivers/net/wireless/intersil/hostap/
 
 HP COMPAQ TC1100 TABLET WMI EXTRAS DRIVER
 L:     platform-driver-x86@vger.kernel.org
@@ -5273,6 +5306,13 @@ L:       netdev@vger.kernel.org
 S:     Supported
 F:     drivers/net/ethernet/ibm/ibmveth.*
 
+IBM Power SRIOV Virtual NIC Device Driver
+M:     Thomas Falcon <tlfalcon@linux.vnet.ibm.com>
+M:     John Allen <jallen@linux.vnet.ibm.com>
+L:     netdev@vger.kernel.org
+S:     Supported
+F:     drivers/net/ethernet/ibm/ibmvnic.*
+
 IBM Power Virtual SCSI Device Drivers
 M:     Tyrel Datwyler <tyreld@linux.vnet.ibm.com>
 L:     linux-scsi@vger.kernel.org
@@ -5603,7 +5643,7 @@ L:        linux-wireless@vger.kernel.org
 S:     Maintained
 F:     Documentation/networking/README.ipw2100
 F:     Documentation/networking/README.ipw2200
-F:     drivers/net/wireless/ipw2x00/
+F:     drivers/net/wireless/intel/ipw2x00/
 
 INTEL(R) TRACE HUB
 M:     Alexander Shishkin <alexander.shishkin@linux.intel.com>
@@ -5635,7 +5675,7 @@ INTEL WIRELESS 3945ABG/BG, 4965AGN (iwlegacy)
 M:     Stanislaw Gruszka <sgruszka@redhat.com>
 L:     linux-wireless@vger.kernel.org
 S:     Supported
-F:     drivers/net/wireless/iwlegacy/
+F:     drivers/net/wireless/intel/iwlegacy/
 
 INTEL WIRELESS WIFI LINK (iwlwifi)
 M:     Johannes Berg <johannes.berg@intel.com>
@@ -5645,7 +5685,7 @@ L:        linux-wireless@vger.kernel.org
 W:     http://intellinuxwireless.org
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi.git
 S:     Supported
-F:     drivers/net/wireless/iwlwifi/
+F:     drivers/net/wireless/intel/iwlwifi/
 
 INTEL MANAGEMENT ENGINE (mei)
 M:     Tomas Winkler <tomas.winkler@intel.com>
@@ -6420,7 +6460,7 @@ S:        Maintained
 F:     arch/powerpc/platforms/8xx/
 
 LINUX FOR POWERPC EMBEDDED PPC83XX AND PPC85XX
-M:     Scott Wood <scottwood@freescale.com>
+M:     Scott Wood <oss@buserror.net>
 M:     Kumar Gala <galak@kernel.crashing.org>
 W:     http://www.penguinppc.org/
 L:     linuxppc-dev@lists.ozlabs.org
@@ -6697,7 +6737,7 @@ F:        drivers/net/ethernet/marvell/sk*
 MARVELL LIBERTAS WIRELESS DRIVER
 L:     libertas-dev@lists.infradead.org
 S:     Orphan
-F:     drivers/net/wireless/libertas/
+F:     drivers/net/wireless/marvell/libertas/
 
 MARVELL MV643XX ETHERNET DRIVER
 M:     Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
@@ -6717,13 +6757,13 @@ M:      Amitkumar Karwar <akarwar@marvell.com>
 M:     Nishant Sarmukadam <nishants@marvell.com>
 L:     linux-wireless@vger.kernel.org
 S:     Maintained
-F:     drivers/net/wireless/mwifiex/
+F:     drivers/net/wireless/marvell/mwifiex/
 
 MARVELL MWL8K WIRELESS DRIVER
 M:     Lennert Buytenhek <buytenh@wantstofly.org>
 L:     linux-wireless@vger.kernel.org
 S:     Odd Fixes
-F:     drivers/net/wireless/mwl8k.c
+F:     drivers/net/wireless/marvell/mwl8k.c
 
 MARVELL SOC MMC/SD/SDIO CONTROLLER DRIVER
 M:     Nicolas Pitre <nico@fluxnic.net>
@@ -7359,6 +7399,13 @@ F:       include/net/netrom.h
 F:     include/uapi/linux/netrom.h
 F:     net/netrom/
 
+NETRONOME ETHERNET DRIVERS
+M:     Jakub Kicinski <jakub.kicinski@netronome.com>
+M:     Rolf Neugebauer <rolf.neugebauer@netronome.com>
+L:     oss-drivers@netronome.com
+S:     Maintained
+F:     drivers/net/ethernet/netronome/
+
 NETWORK BLOCK DEVICE (NBD)
 M:     Markus Pargmann <mpa@pengutronix.de>
 S:     Maintained
@@ -7490,7 +7537,12 @@ F:       net/nfc/
 F:     include/net/nfc/
 F:     include/uapi/linux/nfc.h
 F:     drivers/nfc/
+F:     include/linux/platform_data/microread.h
+F:     include/linux/platform_data/nfcmrvl.h
+F:     include/linux/platform_data/nxp-nci.h
 F:     include/linux/platform_data/pn544.h
+F:     include/linux/platform_data/st21nfca.h
+F:     include/linux/platform_data/st-nci.h
 F:     Documentation/devicetree/bindings/net/nfc/
 
 NFS, SUNRPC, AND LOCKD CLIENTS
@@ -7784,11 +7836,12 @@ F:      drivers/usb/*/*omap*
 F:     arch/arm/*omap*/usb*
 
 OMAP GPIO DRIVER
-M:     Javier Martinez Canillas <javier@dowhile0.org>
+M:     Grygorii Strashko <grygorii.strashko@ti.com>
 M:     Santosh Shilimkar <ssantosh@kernel.org>
 M:     Kevin Hilman <khilman@deeprootsystems.com>
 L:     linux-omap@vger.kernel.org
 S:     Maintained
+F:     Documentation/devicetree/bindings/gpio/gpio-omap.txt
 F:     drivers/gpio/gpio-omap.c
 
 OMAP/NEWFLOW NANOBONE MACHINE SUPPORT
@@ -7940,7 +7993,7 @@ L:        linux-wireless@vger.kernel.org
 W:     http://wireless.kernel.org/en/users/Drivers/orinoco
 W:     http://www.nongnu.org/orinoco/
 S:     Orphan
-F:     drivers/net/wireless/orinoco/
+F:     drivers/net/wireless/intersil/orinoco/
 
 OSD LIBRARY and FILESYSTEM
 M:     Boaz Harrosh <ooo@electrozaur.com>
@@ -7966,7 +8019,7 @@ M:        Christian Lamparter <chunkeey@googlemail.com>
 L:     linux-wireless@vger.kernel.org
 W:     http://wireless.kernel.org/en/users/Drivers/p54
 S:     Maintained
-F:     drivers/net/wireless/p54/
+F:     drivers/net/wireless/intersil/p54/
 
 PA SEMI ETHERNET DRIVER
 M:     Olof Johansson <olof@lixom.net>
@@ -8438,6 +8491,17 @@ F:       fs/timerfd.c
 F:     include/linux/timer*
 F:     kernel/time/*timer*
 
+POWER MANAGEMENT CORE
+M:     "Rafael J. Wysocki" <rjw@rjwysocki.net>
+L:     linux-pm@vger.kernel.org
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
+S:     Supported
+F:     drivers/base/power/
+F:     include/linux/pm.h
+F:     include/linux/pm_*
+F:     include/linux/powercap.h
+F:     drivers/powercap/
+
 POWER SUPPLY CLASS/SUBSYSTEM and DRIVERS
 M:     Sebastian Reichel <sre@kernel.org>
 M:     Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
@@ -8517,7 +8581,7 @@ M:        "Luis R. Rodriguez" <mcgrof@gmail.com>
 L:     linux-wireless@vger.kernel.org
 W:     http://wireless.kernel.org/en/users/Drivers/p54
 S:     Obsolete
-F:     drivers/net/wireless/prism54/
+F:     drivers/net/wireless/intersil/prism54/
 
 PS3 NETWORK SUPPORT
 M:     Geoff Levand <geoff@infradead.org>
@@ -8637,6 +8701,12 @@ F:       include/sound/pxa2xx-lib.h
 F:     sound/arm/pxa*
 F:     sound/soc/pxa/
 
+PXA GPIO DRIVER
+M:     Robert Jarzmik <robert.jarzmik@free.fr>
+L:     linux-gpio@vger.kernel.org
+S:     Maintained
+F:     drivers/gpio/gpio-pxa.c
+
 PXA3xx NAND FLASH DRIVER
 M:     Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
 L:     linux-mtd@lists.infradead.org
@@ -8821,7 +8891,7 @@ M:        Stanislaw Gruszka <sgruszka@redhat.com>
 M:     Helmut Schaa <helmut.schaa@googlemail.com>
 L:     linux-wireless@vger.kernel.org
 S:     Maintained
-F:     drivers/net/wireless/rt2x00/
+F:     drivers/net/wireless/ralink/rt2x00/
 
 RAMDISK RAM BLOCK DEVICE DRIVER
 M:     Jens Axboe <axboe@kernel.dk>
@@ -8953,6 +9023,12 @@ L:       linux-sh@vger.kernel.org
 F:     drivers/net/ethernet/renesas/
 F:     include/linux/sh_eth.h
 
+RENESAS USB2 PHY DRIVER
+M:     Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
+L:     linux-sh@vger.kernel.org
+S:     Maintained
+F:     drivers/phy/phy-rcar-gen3-usb2.c
+
 RESET CONTROLLER FRAMEWORK
 M:     Philipp Zabel <p.zabel@pengutronix.de>
 S:     Maintained
@@ -9062,7 +9138,7 @@ L:        linux-wireless@vger.kernel.org
 W:     http://wireless.kernel.org/
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git
 S:     Orphan
-F:     drivers/net/wireless/rtl818x/rtl8180/
+F:     drivers/net/wireless/realtek/rtl818x/rtl8180/
 
 RTL8187 WIRELESS DRIVER
 M:     Herton Ronaldo Krzesinski <herton@canonical.com>
@@ -9072,7 +9148,7 @@ L:        linux-wireless@vger.kernel.org
 W:     http://wireless.kernel.org/
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git
 S:     Maintained
-F:     drivers/net/wireless/rtl818x/rtl8187/
+F:     drivers/net/wireless/realtek/rtl818x/rtl8187/
 
 RTL8192CE WIRELESS DRIVER
 M:     Larry Finger <Larry.Finger@lwfinger.net>
@@ -9081,8 +9157,8 @@ L:        linux-wireless@vger.kernel.org
 W:     http://wireless.kernel.org/
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git
 S:     Maintained
-F:     drivers/net/wireless/rtlwifi/
-F:     drivers/net/wireless/rtlwifi/rtl8192ce/
+F:     drivers/net/wireless/realtek/rtlwifi/
+F:     drivers/net/wireless/realtek/rtlwifi/rtl8192ce/
 
 RTL8XXXU WIRELESS DRIVER (rtl8xxxu)
 M:     Jes Sorensen <Jes.Sorensen@redhat.com>
@@ -9126,7 +9202,7 @@ F:        drivers/s390/block/dasd*
 F:     block/partitions/ibm.c
 
 S390 NETWORK DRIVERS
-M:     Ursula Braun <ursula.braun@de.ibm.com>
+M:     Ursula Braun <ubraun@linux.vnet.ibm.com>
 L:     linux-s390@vger.kernel.org
 W:     http://www.ibm.com/developerworks/linux/linux390/
 S:     Supported
@@ -9156,7 +9232,7 @@ S:        Supported
 F:     drivers/s390/scsi/zfcp_*
 
 S390 IUCV NETWORK LAYER
-M:     Ursula Braun <ursula.braun@de.ibm.com>
+M:     Ursula Braun <ubraun@linux.vnet.ibm.com>
 L:     linux-s390@vger.kernel.org
 W:     http://www.ibm.com/developerworks/linux/linux390/
 S:     Supported
@@ -9233,8 +9309,10 @@ F:       drivers/regulator/s5m*.c
 F:     drivers/clk/clk-s2mps11.c
 F:     drivers/rtc/rtc-s5m.c
 F:     include/linux/mfd/samsung/
-F:     Documentation/devicetree/bindings/regulator/s5m8767-regulator.txt
-F:     Documentation/devicetree/bindings/mfd/s2mp*.txt
+F:     Documentation/devicetree/bindings/mfd/samsung,sec-core.txt
+F:     Documentation/devicetree/bindings/regulator/samsung,s2m*.txt
+F:     Documentation/devicetree/bindings/regulator/samsung,s5m*.txt
+F:     Documentation/devicetree/bindings/clock/samsung,s2mps11.txt
 
 SAMSUNG S5P/EXYNOS4 SOC SERIES CAMERA SUBSYSTEM DRIVERS
 M:     Kyungmin Park <kyungmin.park@samsung.com>
@@ -9944,7 +10022,6 @@ S:       Supported
 F:     drivers/media/pci/solo6x10/
 
 SOFTWARE RAID (Multiple Disks) SUPPORT
-M:     Neil Brown <neilb@suse.com>
 L:     linux-raid@vger.kernel.org
 S:     Supported
 F:     drivers/md/
@@ -10734,6 +10811,7 @@ F:      net/tipc/
 TILE ARCHITECTURE
 M:     Chris Metcalf <cmetcalf@ezchip.com>
 W:     http://www.ezchip.com/scm/
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile.git
 S:     Supported
 F:     arch/tile/
 F:     drivers/char/tile-srom.c
@@ -11108,6 +11186,7 @@ F:      include/linux/usb/gadget*
 
 USB HID/HIDBP DRIVERS (USB KEYBOARDS, MICE, REMOTE CONTROLS, ...)
 M:     Jiri Kosina <jikos@kernel.org>
+R:     Benjamin Tissoires <benjamin.tissoires@redhat.com>
 L:     linux-usb@vger.kernel.org
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid.git
 S:     Maintained
@@ -11149,7 +11228,7 @@ F:      Documentation/usb/ohci.txt
 F:     drivers/usb/host/ohci*
 
 USB OTG FSM (Finite State Machine)
-M:     Peter Chen <Peter.Chen@freescale.com>
+M:     Peter Chen <Peter.Chen@nxp.com>
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git
 L:     linux-usb@vger.kernel.org
 S:     Maintained
@@ -11185,6 +11264,13 @@ L:     linux-usb@vger.kernel.org
 S:     Supported
 F:     drivers/usb/class/usblp.c
 
+USB QMI WWAN NETWORK DRIVER
+M:     Bjørn Mork <bjorn@mork.no>
+L:     netdev@vger.kernel.org
+S:     Maintained
+F:     Documentation/ABI/testing/sysfs-class-net-qmi
+F:     drivers/net/usb/qmi_wwan.c
+
 USB RTL8150 DRIVER
 M:     Petko Manolov <petkan@nucleusys.com>
 L:     linux-usb@vger.kernel.org
@@ -11281,7 +11367,7 @@ USB ZD1201 DRIVER
 L:     linux-wireless@vger.kernel.org
 W:     http://linux-lc100020.sourceforge.net
 S:     Orphan
-F:     drivers/net/wireless/zd1201.*
+F:     drivers/net/wireless/zydas/zd1201.*
 
 USB ZR364XX DRIVER
 M:     Antoine Jacquet <royale@zerezo.com>
@@ -11613,6 +11699,7 @@ F:      drivers/input/tablet/wacom_serial4.c
 
 WATCHDOG DEVICE DRIVERS
 M:     Wim Van Sebroeck <wim@iguana.be>
+R:     Guenter Roeck <linux@roeck-us.net>
 L:     linux-watchdog@vger.kernel.org
 W:     http://www.linux-watchdog.org/
 T:     git git://www.linux-watchdog.org/linux-watchdog.git
@@ -11684,6 +11771,7 @@ F:      drivers/input/touchscreen/wm831x-ts.c
 F:     drivers/input/touchscreen/wm97*.c
 F:     drivers/mfd/arizona*
 F:     drivers/mfd/wm*.c
+F:     drivers/mfd/cs47l24*
 F:     drivers/power/wm83*.c
 F:     drivers/rtc/rtc-wm83*.c
 F:     drivers/regulator/wm8*.c
@@ -11697,6 +11785,7 @@ F:      include/linux/wm97xx.h
 F:     include/sound/wm????.h
 F:     sound/soc/codecs/arizona.?
 F:     sound/soc/codecs/wm*
+F:     sound/soc/codecs/cs47l24*
 
 WORKQUEUE
 M:     Tejun Heo <tj@kernel.org>
@@ -11912,7 +12001,7 @@ W:      http://zd1211.ath.cx/wiki/DriverRewrite
 L:     linux-wireless@vger.kernel.org
 L:     zd1211-devs@lists.sourceforge.net (subscribers-only)
 S:     Maintained
-F:     drivers/net/wireless/zd1211rw/
+F:     drivers/net/wireless/zydas/zd1211rw/
 
 ZPOOL COMPRESSED PAGE STORAGE API
 M:     Dan Streetman <ddstreet@ieee.org>
Unnamed repository; edit this file 'description' to name the repository.