summaryrefslogtreecommitdiff
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2017-04-13 14:17:06 (GMT)
committerTom Rini <trini@konsulko.com>2017-04-13 15:19:00 (GMT)
commit1622559066d890f1b7622be0ede8a5d64de66ef3 (patch)
tree3d7a01ff07bff410c6650eae19b704cd0419c254 /MAINTAINERS
parent0342e335ba887817ed401e77be324e064ea7031e (diff)
parentf479cec3b623778c26b23f66dc28cf33100ce089 (diff)
downloadu-boot-fsl-qoriq-1622559066d890f1b7622be0ede8a5d64de66ef3.tar.xz
Merge branch 'master' of git://www.denx.de/git/u-boot-imx
Drop CONFIG_STACKSIZE from include/configs/imx6_logic.h Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS3
1 files changed, 1 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 6c702f2..eadb21f 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -93,10 +93,9 @@ S: Maintained
T: git git://git.denx.de/u-boot-imx.git
F: arch/arm/cpu/arm1136/mx*/
F: arch/arm/cpu/arm926ejs/mx*/
-F: arch/arm/cpu/arm926ejs/imx/
F: arch/arm/cpu/armv7/mx*/
F: arch/arm/cpu/armv7/vf610/
-F: arch/arm/cpu/imx-common/
+F: arch/arm/imx-common/
F: arch/arm/include/asm/arch-imx/
F: arch/arm/include/asm/arch-mx*/
F: arch/arm/include/asm/arch-vf610/