Browse code Merge branch 'for-next/mxs-nand' Conflicts: arch/arm/mach-mxs/Kconfig arch/arm/mach-mxs/Makefile drivers/Makefile WIP_next-LS master next stable/v2013.05 stable/v2013.06 stable/v2013.07 stable/v2013.08 stable/v2013.10 stable/v2014.05 stable/v2014.06 stable/v2014.07 stable/v2014.08 stable/v2014.09 stable/v2014.10 stable/v2014.11 stable/v2014.12 stable/v2015.01 stable/v2015.02 stable/v2017.05 stable/v2017.06 stable/v2017.07 stable/v2017.11 stable/v2018.07 stable/v2018.09 stable/v2018.12 work/fit-support v2020.07.0 v2020.06.0 v2020.05.0 v2020.04.0 v2020.03.0 v2020.02.0 v2020.01.0 v2019.12.0 v2019.11.0 v2019.10.0 v2019.09.0 v2019.08.1 v2019.08.0 v2019.07.0 v2019.06.1 v2019.06.0 v2019.05.0 v2019.04.0 v2019.03.0 v2019.02.0 v2019.01.0 v2018.12.0 v2018.11.0 v2018.10.0 v2018.09.1 v2018.09.0 v2018.08.1 v2018.08.0 v2018.07.2 v2018.07.1 v2018.07.0 v2018.06.0 v2018.05.0 v2018.04.0 v2018.03.0 v2018.02.0 v2018.01.0 v2017.12.0 v2017.11.0 v2017.10.0 v2017.09.0 v2017.08.0 v2017.07.1 v2017.07.0 v2017.06.2 v2017.06.1 v2017.06.0 v2017.05.4 v2017.05.3 v2017.05.2 v2017.05.1 v2017.05.0 v2017.04.0 v2017.03.0 v2017.02.0 v2017.01.0 v2016.11.0 v2016.10.0 v2016.09.0 v2016.08.0 v2016.07.0 v2016.06.0 v2016.05.0 v2016.04.0 v2016.03.0 v2016.02.0 v2016.01.0 v2015.12.0 v2015.11.0 v2015.10.0 v2015.09.0 v2015.08.0 v2015.07.0 v2015.06.0 v2015.05.0 v2015.04.0 v2015.03.0 v2015.02.0 v2015.01.0 v2014.12.0 v2014.11.0 v2014.10.0 v2014.09.0 v2014.08.0 v2014.07.0 v2014.06.0 v2014.05.0 v2014.04.0 v2014.03.0 v2014.02.0 v2014.01.0 v2013.12.0 v2013.11.0 v2013.10.1 v2013.10.0 v2013.09.0 v2013.08.1 v2013.08.0 v2013.07.0 v2013.06.1 v2013.06.0 v2013.05.1 v2013.05.0 v2013.04.0 v2013.03.0 v2013.02.0 v2013.01.0 v2012.12.1 v2012.12.0 v2012.11.0 v2012.10.0 v2012.09.0 v2012.08.0

commit d04ce5dfe7d2a7502c9a77952164dd6a1e1666a4 2 parents 1510c57 + 0256d59 Sascha Hauer authored on 2 Jul 2012

Showing 20 changed files

• arch/arm/mach-mxs/Kconfig
• arch/arm/mach-mxs/Makefile
• arch/arm/mach-mxs/bcb.c
• arch/arm/mach-mxs/common.c
• arch/arm/mach-mxs/include/mach/clock-imx23.h
• arch/arm/mach-mxs/include/mach/clock-imx28.h
• arch/arm/mach-mxs/include/mach/dma.h
• arch/arm/mach-mxs/include/mach/imx23-regs.h
• arch/arm/mach-mxs/include/mach/imx28-regs.h
• arch/arm/mach-mxs/include/mach/mxs.h
• arch/arm/mach-mxs/speed-imx23.c
• arch/arm/mach-mxs/speed-imx28.c
• drivers/Kconfig
• drivers/Makefile
• drivers/dma/Kconfig
• drivers/dma/Makefile
• drivers/dma/apbh_dma.c
• drivers/mtd/nand/Kconfig
• drivers/mtd/nand/Makefile
• drivers/mtd/nand/nand_mxs.c

Ignore Space Show notes View arch/arm/mach-mxs/Kconfig

Ignore Space Show notes View arch/arm/mach-mxs/Makefile

Ignore Space Show notes View arch/arm/mach-mxs/bcb.c 0 → 100644

Ignore Space Show notes View arch/arm/mach-mxs/common.c 0 → 100644

Ignore Space Show notes View arch/arm/mach-mxs/include/mach/clock-imx23.h

Ignore Space Show notes View arch/arm/mach-mxs/include/mach/clock-imx28.h

Ignore Space Show notes View arch/arm/mach-mxs/include/mach/dma.h 0 → 100644

Ignore Space Show notes View arch/arm/mach-mxs/include/mach/imx23-regs.h

Ignore Space Show notes View arch/arm/mach-mxs/include/mach/imx28-regs.h

Ignore Space Show notes View arch/arm/mach-mxs/include/mach/mxs.h 0 → 100644

Ignore Space Show notes View arch/arm/mach-mxs/speed-imx23.c

Ignore Space Show notes View arch/arm/mach-mxs/speed-imx28.c

Ignore Space Show notes View drivers/Kconfig

Ignore Space Show notes View drivers/Makefile

Ignore Space Show notes View drivers/dma/Kconfig 0 → 100644

Ignore Space Show notes View drivers/dma/Makefile 0 → 100644

Ignore Space Show notes View drivers/dma/apbh_dma.c 0 → 100644

Ignore Space Show notes View drivers/mtd/nand/Kconfig

Ignore Space Show notes View drivers/mtd/nand/Makefile

Ignore Space Show notes View drivers/mtd/nand/nand_mxs.c 0 → 100644
Too large (Show diff)

Show line notes below