diff --git a/[refs] b/[refs] index 1a61ae17af62..66b74c09f5a7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8e71bde9eb408d652a2b0a736cacf4c0a8800d57 +refs/heads/master: bad985a16fb8b4dc0deeadc6ddbc91223a8ecbf9 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 0f14537ad308..328c65ca0530 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -3207,7 +3207,7 @@ M: Sascha Hauer L: linux-fbdev@vger.kernel.org L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) S: Maintained -F: arch/arm/plat-mxc/include/mach/imxfb.h +F: include/linux/platform_data/video-imxfb.h F: drivers/video/imxfb.c FREESCALE SOC FS_ENET DRIVER