diff --git a/[refs] b/[refs] index f0be72460f33..422da08a1eb7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fac7de14f8b9919c8f9ec16cc0607b798182d19d +refs/heads/master: 5351684f435427a68e1e02e9b592559997cd3620 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index ef81c8c91123..e6dd8da90ade 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -974,12 +974,11 @@ F: drivers/input/keyboard/w90p910_keypad.c F: drivers/input/touchscreen/w90p910_ts.c F: drivers/watchdog/nuc900_wdt.c F: drivers/net/arm/w90p910_ether.c -F: drivers/mtd/nand/w90p910_nand.c +F: drivers/mtd/nand/nuc900_nand.c F: drivers/rtc/rtc-nuc900.c F: drivers/spi/spi_nuc900.c F: drivers/usb/host/ehci-w90x900.c F: drivers/video/nuc900fb.c -F: drivers/sound/soc/nuc900/ ARM/U300 MACHINE SUPPORT M: Linus Walleij