diff --git a/[refs] b/[refs] index b75223f177c9..b7bf7f71e2fe 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7beefe1dd8e227c387b7fcd44161833aaef5f8ea +refs/heads/master: 6f0d65afd4c53bc41263e8484ea28fa414648d72 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index c99688b855cd..53c8b38381b2 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -1402,7 +1402,7 @@ L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) S: Supported F: drivers/dma/at_hdmac.c F: drivers/dma/at_hdmac_regs.h -F: arch/arm/mach-at91/include/mach/at_hdmac.h +F: include/linux/platform_data/dma-atmel.h ATMEL ISI DRIVER M: Josh Wu