From e846ee5f013d8236326f890ea4573004b286df88 Mon Sep 17 00:00:00 2001 From: Richard Weinberger Date: Fri, 8 Aug 2014 14:23:46 -0700 Subject: update Roland McGrath's mail roland@redhat.com bounces, change it to roland@hack.frob.com. Signed-off-by: Richard Weinberger Acked-by: Roland McGrath Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- MAINTAINERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'MAINTAINERS') diff --git a/MAINTAINERS b/MAINTAINERS index 946a67e..1219dbae 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -7203,7 +7203,7 @@ F: drivers/ptp/* F: include/linux/ptp_cl* PTRACE SUPPORT -M: Roland McGrath +M: Roland McGrath M: Oleg Nesterov S: Maintained F: include/asm-generic/syscall.h -- cgit v1.1 From d347087b6eb5793ec96be998c5a283935972673d Mon Sep 17 00:00:00 2001 From: Joe Perches Date: Fri, 8 Aug 2014 14:23:48 -0700 Subject: MAINTAINERS: remove two ancient EATA sections These haven't had a single ack by the listed maintainer in all git history and the email addresses don't work. An EATA entry for Michael Neuffer is already in CREDITS. Signed-off-by: Joe Perches Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- MAINTAINERS | 14 -------------- 1 file changed, 14 deletions(-) (limited to 'MAINTAINERS') diff --git a/MAINTAINERS b/MAINTAINERS index 1219dbae..7624103d 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3239,26 +3239,12 @@ T: git git://linuxtv.org/anttip/media_tree.git S: Maintained F: drivers/media/tuners/e4000* -EATA-DMA SCSI DRIVER -M: Michael Neuffer -L: linux-eata@i-connect.net -L: linux-scsi@vger.kernel.org -S: Maintained -F: drivers/scsi/eata* - EATA ISA/EISA/PCI SCSI DRIVER M: Dario Ballabio L: linux-scsi@vger.kernel.org S: Maintained F: drivers/scsi/eata.c -EATA-PIO SCSI DRIVER -M: Michael Neuffer -L: linux-eata@i-connect.net -L: linux-scsi@vger.kernel.org -S: Maintained -F: drivers/scsi/eata_pio.* - EC100 MEDIA DRIVER M: Antti Palosaari L: linux-media@vger.kernel.org -- cgit v1.1 From f9213e78c42ce9f712400b699511acfff51351a5 Mon Sep 17 00:00:00 2001 From: Michael Opdenacker Date: Fri, 8 Aug 2014 14:23:50 -0700 Subject: MAINTAINERS: update IBM ServeRAID RAID info - Invalid maintainer e-mail address: Mail server reply: Recipient address rejected: User unknown in virtual alias table - Remove no longer working webpage URL - Remove obsolete "Person" field - Move status to "Orphan" - Add Dave Jeffery and Jack Hammer to the CREDITS file Signed-off-by: Michael Opdenacker Reviewed-by: Jean Delvare Cc: David Jeffery Cc: James Bottomley Cc: Paul Bolle Reviewed-by: Jingoo Han Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- MAINTAINERS | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'MAINTAINERS') diff --git a/MAINTAINERS b/MAINTAINERS index 7624103d..17f5f9f 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -4495,10 +4495,7 @@ S: Supported F: drivers/scsi/ibmvscsi/ibmvfc* IBM ServeRAID RAID DRIVER -P: Jack Hammer -M: Dave Jeffery -W: http://www.developer.ibm.com/welcome/netfinity/serveraid.html -S: Supported +S: Orphan F: drivers/scsi/ips.* ICH LPC AND GPIO DRIVER -- cgit v1.1 From 73d425fd1dda72bbc198e23ccb7c259d15fe49d8 Mon Sep 17 00:00:00 2001 From: Joe Perches Date: Fri, 8 Aug 2014 14:24:57 -0700 Subject: MAINTAINERS: update microcode patterns Commit bad5fa631fca ("x86, microcode: Move to a proper location") moved the files, update the pattern. Signed-off-by: Joe Perches Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- MAINTAINERS | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'MAINTAINERS') diff --git a/MAINTAINERS b/MAINTAINERS index 17f5f9f..a306473 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -621,7 +621,7 @@ AMD MICROCODE UPDATE SUPPORT M: Andreas Herrmann L: amd64-microcode@amd64.org S: Maintained -F: arch/x86/kernel/microcode_amd.c +F: arch/x86/kernel/cpu/microcode/amd* AMD XGBE DRIVER M: Tom Lendacky @@ -4692,8 +4692,8 @@ F: drivers/platform/x86/intel_menlow.c INTEL IA32 MICROCODE UPDATE SUPPORT M: Tigran Aivazian S: Maintained -F: arch/x86/kernel/microcode_core.c -F: arch/x86/kernel/microcode_intel.c +F: arch/x86/kernel/cpu/microcode/core* +F: arch/x86/kernel/cpu/microcode/intel* INTEL I/OAT DMA DRIVER M: Dan Williams -- cgit v1.1 From ec421a7144d450e306232ed568a8edf328a06d6a Mon Sep 17 00:00:00 2001 From: Joe Perches Date: Fri, 8 Aug 2014 14:24:59 -0700 Subject: MAINTAINERS: update cifs location Commit 30706a545417 ("cifs: create a new Documentation/ directory and move docfiles into it") moved the files, update the pattern. Signed-off-by: Joe Perches Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- MAINTAINERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'MAINTAINERS') diff --git a/MAINTAINERS b/MAINTAINERS index a306473..12e8cfa 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2415,7 +2415,7 @@ W: http://linux-cifs.samba.org/ Q: http://patchwork.ozlabs.org/project/linux-cifs-client/list/ T: git git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6.git S: Supported -F: Documentation/filesystems/cifs.txt +F: Documentation/filesystems/cifs/ F: fs/cifs/ COMPACTPCI HOTPLUG CORE -- cgit v1.1 From fb2efb5ce83c30aa4687251024c648e099f426ae Mon Sep 17 00:00:00 2001 From: Joe Perches Date: Fri, 8 Aug 2014 14:25:01 -0700 Subject: MAINTAINERS: use the correct efi-stub location Commit 4171fe2f8a47 ("EFI stub documentation updates") moved the file, update the pattern. Signed-off-by: Joe Perches Acked-by: Roy Franz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- MAINTAINERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'MAINTAINERS') diff --git a/MAINTAINERS b/MAINTAINERS index 12e8cfa..4031bb8 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3419,7 +3419,7 @@ M: Matt Fleming L: linux-efi@vger.kernel.org T: git git://git.kernel.org/pub/scm/linux/kernel/git/mfleming/efi.git S: Maintained -F: Documentation/x86/efi-stub.txt +F: Documentation/efi-stub.txt F: arch/ia64/kernel/efi.c F: arch/x86/boot/compressed/eboot.[ch] F: arch/x86/include/asm/efi.h -- cgit v1.1 From 4a9c44f15a73846ae059285daec07d16c6fe81dd Mon Sep 17 00:00:00 2001 From: Joe Perches Date: Fri, 8 Aug 2014 14:25:03 -0700 Subject: MAINTAINERS: update clk/sirf patterns Commit 7bf21bc81f28 ("clk: sirf: re-arch to make the codes support both prima2 and atlas6") moved the files, update the patterns. Signed-off-by: Joe Perches Cc: Barry Song Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- MAINTAINERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'MAINTAINERS') diff --git a/MAINTAINERS b/MAINTAINERS index 4031bb8..18dddd8 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -911,7 +911,7 @@ L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) T: git git://git.kernel.org/pub/scm/linux/kernel/git/baohua/linux.git S: Maintained F: arch/arm/mach-prima2/ -F: drivers/clk/clk-prima2.c +F: drivers/clk/sirf/ F: drivers/clocksource/timer-prima2.c F: drivers/clocksource/timer-marco.c N: [^a-z]sirf -- cgit v1.1 From 0a759c6ead8470ca6c8ef000615d167db9715626 Mon Sep 17 00:00:00 2001 From: Joe Perches Date: Fri, 8 Aug 2014 14:25:05 -0700 Subject: MAINTAINERS: fix ssbi pattern Incorrect pattern used, it's not a directory, it's a file. Fix it. Signed-off-by: Joe Perches Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- MAINTAINERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'MAINTAINERS') diff --git a/MAINTAINERS b/MAINTAINERS index 18dddd8..4d5790c 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1178,7 +1178,7 @@ F: drivers/mmc/host/msm_sdcc.h F: drivers/tty/serial/msm_serial.h F: drivers/tty/serial/msm_serial.c F: drivers/*/pm8???-* -F: drivers/mfd/ssbi/ +F: drivers/mfd/ssbi.c F: include/linux/mfd/pm8xxx/ T: git git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm.git S: Maintained -- cgit v1.1 From e4ef47f2fe33906be2a03e5b91c68c84d2613af4 Mon Sep 17 00:00:00 2001 From: Joe Perches Date: Fri, 8 Aug 2014 14:25:08 -0700 Subject: MAINTAINERS: use correct filename for sdhci-bcm-kona Use dashes not underscores. Signed-off-by: Joe Perches Cc: Christian Daudt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- MAINTAINERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'MAINTAINERS') diff --git a/MAINTAINERS b/MAINTAINERS index 4d5790c..c453de3 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1983,7 +1983,7 @@ F: arch/arm/boot/dts/bcm113* F: arch/arm/boot/dts/bcm216* F: arch/arm/boot/dts/bcm281* F: arch/arm/configs/bcm_defconfig -F: drivers/mmc/host/sdhci_bcm_kona.c +F: drivers/mmc/host/sdhci-bcm-kona.c F: drivers/clocksource/bcm_kona_timer.c BROADCOM BCM2835 ARM ARCHICTURE -- cgit v1.1 From 9a67f099c802879c1dd7952114faee4adcf0a5b4 Mon Sep 17 00:00:00 2001 From: Joe Perches Date: Fri, 8 Aug 2014 14:25:10 -0700 Subject: MAINTAINERS: fix PXA3xx NAND FLASH DRIVER pattern Use underscore, not dash Signed-off-by: Joe Perches Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- MAINTAINERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'MAINTAINERS') diff --git a/MAINTAINERS b/MAINTAINERS index c453de3..13dbfe9 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -7245,7 +7245,7 @@ PXA3xx NAND FLASH DRIVER M: Ezequiel Garcia L: linux-mtd@lists.infradead.org S: Maintained -F: drivers/mtd/nand/pxa3xx-nand.c +F: drivers/mtd/nand/pxa3xx_nand.c MMP SUPPORT M: Eric Miao -- cgit v1.1 From b87339877e0f15ecf61d34b41ab442209c1ca085 Mon Sep 17 00:00:00 2001 From: Joe Perches Date: Fri, 8 Aug 2014 14:25:12 -0700 Subject: MAINTAINERS: update picoxcell patterns Fix the picoxcell patterns, add the dts directory too. Signed-off-by: Joe Perches Acked-by: Jamie Iles Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- MAINTAINERS | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'MAINTAINERS') diff --git a/MAINTAINERS b/MAINTAINERS index 13dbfe9..b824adc3 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -6959,9 +6959,9 @@ M: Jamie Iles L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) T: git git://github.com/jamieiles/linux-2.6-ji.git S: Supported +F: arch/arm/boot/dts/picoxcell* F: arch/arm/mach-picoxcell/ -F: drivers/*/picoxcell* -F: drivers/*/*/picoxcell* +F: drivers/crypto/picoxcell* PIN CONTROL SUBSYSTEM M: Linus Walleij -- cgit v1.1 From 988636a8bed6c7b0ccdb1ccfdf7264e953ee4299 Mon Sep 17 00:00:00 2001 From: Joe Perches Date: Fri, 8 Aug 2014 14:25:14 -0700 Subject: MAINTAINERS: remove section CIRRUS LOGIC EP93XX OHCI USB HOST DRIVER Commit e55f7cd24676 ("usb: ohci: remove ep93xx bus glue platform driver") removed the file, remove the section. Signed-off-by: Joe Perches Cc: H Hartley Sweeten Cc: Lennert Buytenhek Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- MAINTAINERS | 6 ------ 1 file changed, 6 deletions(-) (limited to 'MAINTAINERS') diff --git a/MAINTAINERS b/MAINTAINERS index b824adc3..8791bc1 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2325,12 +2325,6 @@ L: netdev@vger.kernel.org S: Maintained F: drivers/net/ethernet/cirrus/ep93xx_eth.c -CIRRUS LOGIC EP93XX OHCI USB HOST DRIVER -M: Lennert Buytenhek -L: linux-usb@vger.kernel.org -S: Maintained -F: drivers/usb/host/ohci-ep93xx.c - CIRRUS LOGIC AUDIO CODEC DRIVERS M: Brian Austin M: Paul Handrigan -- cgit v1.1 From d656143a1d2363aa8dbef2797edf0c91c9e891fc Mon Sep 17 00:00:00 2001 From: Joe Perches Date: Fri, 8 Aug 2014 14:25:16 -0700 Subject: MAINTAINERS: remove METAG imgdafs pattern This never made it into the kernel tree. Remove it. Signed-off-by: Joe Perches Acked-by: James Hogan Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- MAINTAINERS | 1 - 1 file changed, 1 deletion(-) (limited to 'MAINTAINERS') diff --git a/MAINTAINERS b/MAINTAINERS index 8791bc1..73bb906 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -5867,7 +5867,6 @@ F: drivers/clocksource/metag_generic.c F: drivers/irqchip/irq-metag.c F: drivers/irqchip/irq-metag-ext.c F: drivers/tty/metag_da.c -F: fs/imgdafs/ MICROBLAZE ARCHITECTURE M: Michal Simek -- cgit v1.1 From eb231527b54b47f6ce61a8771813e7cd69510d82 Mon Sep 17 00:00:00 2001 From: Joe Perches Date: Fri, 8 Aug 2014 14:25:18 -0700 Subject: MAINTAINERS: remove unused radeon drm pattern Commit 8dcedd7e87f4 ("UAPI: (Scripted) Disintegrate include/drm") moved the file, remove the pattern. Signed-off-by: Joe Perches Cc: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- MAINTAINERS | 1 - 1 file changed, 1 deletion(-) (limited to 'MAINTAINERS') diff --git a/MAINTAINERS b/MAINTAINERS index 73bb906..527cc95 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3039,7 +3039,6 @@ L: dri-devel@lists.freedesktop.org T: git git://people.freedesktop.org/~agd5f/linux S: Supported F: drivers/gpu/drm/radeon/ -F: include/drm/radeon* F: include/uapi/drm/radeon* DRM PANEL DRIVERS -- cgit v1.1 From 1db22e8b837246608a467e7f0a7d1b2ff0c92a19 Mon Sep 17 00:00:00 2001 From: Joe Perches Date: Fri, 8 Aug 2014 14:25:20 -0700 Subject: MAINTAINERS: remove unusd ARM/QUALCOMM MSM pattern Commit 87933a68dce6 ("mfd: pm8921: Remove pm8xxx API now that sub-devices use regmap") removed the file, remove the pattern. Signed-off-by: Joe Perches Reviewed-by: Stephen Boyd Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- MAINTAINERS | 1 - 1 file changed, 1 deletion(-) (limited to 'MAINTAINERS') diff --git a/MAINTAINERS b/MAINTAINERS index 527cc95..f0cf109 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1179,7 +1179,6 @@ F: drivers/tty/serial/msm_serial.h F: drivers/tty/serial/msm_serial.c F: drivers/*/pm8???-* F: drivers/mfd/ssbi.c -F: include/linux/mfd/pm8xxx/ T: git git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm.git S: Maintained -- cgit v1.1 From 935e9f02e798051d2923d59f6025cd74f59aa0e1 Mon Sep 17 00:00:00 2001 From: Joe Perches Date: Fri, 8 Aug 2014 14:25:22 -0700 Subject: MAINTAINERS: remove unused NFSD pattern A series of commits by Christoph Hellwig removed all the files in this directory, remove the pattern. Signed-off-by: Joe Perches Cc: Christoph Hellwig Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- MAINTAINERS | 1 - 1 file changed, 1 deletion(-) (limited to 'MAINTAINERS') diff --git a/MAINTAINERS b/MAINTAINERS index f0cf109..f49eb67 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -5144,7 +5144,6 @@ L: linux-nfs@vger.kernel.org W: http://nfs.sourceforge.net/ S: Supported F: fs/nfsd/ -F: include/linux/nfsd/ F: include/uapi/linux/nfsd/ F: fs/lockd/ F: fs/nfs_common/ -- cgit v1.1 From e46d12c65998c7ac6a8544fc356e2297228b207a Mon Sep 17 00:00:00 2001 From: Joe Perches Date: Fri, 8 Aug 2014 14:26:16 -0700 Subject: MAINTAINERS: update DMA BUFFER SHARING patterns One pattern per F: line please... Signed-off-by: Joe Perches Acked-by: Sumit Semwal Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- MAINTAINERS | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'MAINTAINERS') diff --git a/MAINTAINERS b/MAINTAINERS index f49eb67..d53afcb 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2943,7 +2943,9 @@ L: linux-media@vger.kernel.org L: dri-devel@lists.freedesktop.org L: linaro-mm-sig@lists.linaro.org F: drivers/dma-buf/ -F: include/linux/dma-buf* include/linux/reservation.h include/linux/*fence.h +F: include/linux/dma-buf* +F: include/linux/reservation.h +F: include/linux/*fence.h F: Documentation/dma-buf-sharing.txt T: git git://git.linaro.org/people/sumitsemwal/linux-dma-buf.git -- cgit v1.1 From faf2e1dbd8744a48dd6c5666aaa9db80373a61b4 Mon Sep 17 00:00:00 2001 From: Joe Perches Date: Fri, 8 Aug 2014 14:26:18 -0700 Subject: MAINTAINERS: update usb/gadget patterns Several commits have moved files around, update the section patterns. Signed-off-by: Joe Perches Cc: Thomas Dahlmann Cc: Nicolas Ferre Cc: Li Yang Cc: Eric Miao Cc: Russell King Cc: Haojian Zhuang Acked-by: Laurent Pinchart Cc: Andrzej Pietrasiewicz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- MAINTAINERS | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'MAINTAINERS') diff --git a/MAINTAINERS b/MAINTAINERS index d53afcb..9c28a5a 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -597,7 +597,7 @@ AMD GEODE CS5536 USB DEVICE CONTROLLER DRIVER M: Thomas Dahlmann L: linux-geode@lists.infradead.org (moderated for non-subscribers) S: Supported -F: drivers/usb/gadget/amd5536udc.* +F: drivers/usb/gadget/udc/amd5536udc.* AMD GEODE PROCESSOR/CHIPSET SUPPORT P: Andres Salomon @@ -1690,7 +1690,7 @@ ATMEL USBA UDC DRIVER M: Nicolas Ferre L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) S: Supported -F: drivers/usb/gadget/atmel_usba_udc.* +F: drivers/usb/gadget/udc/atmel_usba_udc.* ATMEL WIRELESS DRIVER M: Simon Kelley @@ -3800,7 +3800,7 @@ M: Li Yang L: linux-usb@vger.kernel.org L: linuxppc-dev@lists.ozlabs.org S: Maintained -F: drivers/usb/gadget/fsl* +F: drivers/usb/gadget/udc/fsl* FREESCALE QUICC ENGINE UCC ETHERNET DRIVER M: Li Yang @@ -7228,7 +7228,7 @@ S: Maintained F: arch/arm/mach-pxa/ F: drivers/pcmcia/pxa2xx* F: drivers/spi/spi-pxa2xx* -F: drivers/usb/gadget/pxa2* +F: drivers/usb/gadget/udc/pxa2* F: include/sound/pxa2xx-lib.h F: sound/arm/pxa* F: sound/soc/pxa/ @@ -9582,8 +9582,8 @@ USB WEBCAM GADGET M: Laurent Pinchart L: linux-usb@vger.kernel.org S: Maintained -F: drivers/usb/gadget/*uvc*.c -F: drivers/usb/gadget/webcam.c +F: drivers/usb/gadget/function/*uvc*.c +F: drivers/usb/gadget/legacy/webcam.c USB WIRELESS RNDIS DRIVER (rndis_wlan) M: Jussi Kivilinna -- cgit v1.1 From ecc265fe9e09e32a3573b2ba26e79b2099eb8bbb Mon Sep 17 00:00:00 2001 From: Joe Perches Date: Fri, 8 Aug 2014 14:26:20 -0700 Subject: MAINTAINERS: update nomadik patterns Commit 3a19805920f1 ("pinctrl: nomadik: move all Nomadik drivers to subdir") move the files, update the patterns Signed-off-by: Joe Perches Cc: Linus Walleij Cc: Alessandro Rubini Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- MAINTAINERS | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'MAINTAINERS') diff --git a/MAINTAINERS b/MAINTAINERS index 9c28a5a..101445b 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1157,6 +1157,7 @@ M: Linus Walleij L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) S: Maintained F: arch/arm/mach-nomadik/ +F: drivers/pinctrl/nomadik/ F: drivers/i2c/busses/i2c-nomadik.c T: git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik.git @@ -1434,7 +1435,8 @@ F: drivers/mfd/abx500* F: drivers/mfd/ab8500* F: drivers/mfd/dbx500* F: drivers/mfd/db8500* -F: drivers/pinctrl/pinctrl-nomadik* +F: drivers/pinctrl/nomadik/pinctrl-ab* +F: drivers/pinctrl/nomadik/pinctrl-nomadik* F: drivers/rtc/rtc-ab8500.c F: drivers/rtc/rtc-pl031.c T: git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git -- cgit v1.1