From 8e1c5f2e588ad2641cb84dc4112a98ba9d3e2496 Mon Sep 17 00:00:00 2001 From: Joe Perches Date: Tue, 10 Jan 2012 15:09:06 -0800 Subject: [PATCH] --- yaml --- r: 283047 b: refs/heads/master c: 9df92e6c770e2709f6e3080a4a82d71953267f05 h: refs/heads/master i: 283045: 7057365d0b9ad0015a84ed541e42e574eaa658bb 283043: a9ea061938a2acd64d4d6e389d4732b0295f700c 283039: 69394f022427a3b3943f1c2b31ba33dcde898985 v: v3 --- [refs] | 2 +- trunk/MAINTAINERS | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 0f044b54dc8f..3c8cadb6a0da 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8460241e4477db699135ad0521e1293258a8baaa +refs/heads/master: 9df92e6c770e2709f6e3080a4a82d71953267f05 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 7510b6339222..e4eeb9b856a2 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -1144,7 +1144,7 @@ F: drivers/watchdog/nuc900_wdt.c F: drivers/net/ethernet/nuvoton/w90p910_ether.c F: drivers/mtd/nand/nuc900_nand.c F: drivers/rtc/rtc-nuc900.c -F: drivers/spi/spi_nuc900.c +F: drivers/spi/spi-nuc900.c F: drivers/usb/host/ehci-w90x900.c F: drivers/video/nuc900fb.c @@ -1348,7 +1348,7 @@ F: drivers/net/ethernet/cadence/ ATMEL SPI DRIVER M: Nicolas Ferre S: Supported -F: drivers/spi/atmel_spi.* +F: drivers/spi/spi-atmel.* ATMEL USBA UDC DRIVER M: Nicolas Ferre @@ -5308,7 +5308,7 @@ T: git git://git.linaro.org/people/ycmiao/pxa-linux.git S: Maintained F: arch/arm/mach-pxa/ F: drivers/pcmcia/pxa2xx* -F: drivers/spi/pxa2xx* +F: drivers/spi/spi-pxa2xx* F: drivers/usb/gadget/pxa2* F: include/sound/pxa2xx-lib.h F: sound/arm/pxa*