diff --git a/[refs] b/[refs] index f83565d15d21..899ead4e0182 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9b692346f8e1fdd38e40b0e203e968a7d61a1642 +refs/heads/master: e5dafa224f295e9120c3a9f39e9f5d375583c0e2 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 35030a84ee3e..baa17094f3a0 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -760,6 +760,7 @@ S: Maintained T: git git://git.pengutronix.de/git/imx/linux-2.6.git F: arch/arm/mach-imx/ F: arch/arm/plat-mxc/ +F: arch/arm/configs/imx*_defconfig ARM/FREESCALE IMX6 M: Shawn Guo