diff --git a/[refs] b/[refs] index 3297434f85d0..16fde2aff3e5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ef8781989a1bcd05aa47e853917c37df44917194 +refs/heads/master: 24e1511f675b97a76488b89017a40909be731b63 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 4e41d5255d72..b087b3bca290 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -1310,7 +1310,7 @@ F: drivers/atm/ F: include/linux/atm* ATMEL AT91 MCI DRIVER -M: Nicolas Ferre +M: Ludovic Desroches L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) W: http://www.atmel.com/products/AT91/ W: http://www.at91.com/ @@ -1318,7 +1318,7 @@ S: Maintained F: drivers/mmc/host/at91_mci.c ATMEL AT91 / AT32 MCI DRIVER -M: Nicolas Ferre +M: Ludovic Desroches S: Maintained F: drivers/mmc/host/atmel-mci.c F: drivers/mmc/host/atmel-mci-regs.h