Browse code Merge branch 'for-next/of' Conflicts: arch/arm/mach-imx/Makefile WIP_next-LS master next 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

commit 579b794b5d13e4a1ffa21d2426bfab7050eaba9d 2 parents 646a0d0 + 32dc070 Sascha Hauer authored on 6 May 2013

Showing 18 changed files

• arch/arm/mach-imx/Kconfig
• arch/arm/mach-imx/Makefile
• arch/arm/mach-imx/iomux-v1.c
• arch/arm/mach-imx/iomux-v2.c
• arch/arm/mach-imx/iomux-v3.c
• drivers/Kconfig
• drivers/Makefile
• drivers/base/driver.c
• drivers/of/base.c
• drivers/of/partition.c
• drivers/pinctrl/Kconfig
• drivers/pinctrl/Makefile
• drivers/pinctrl/imx-iomux-v1.c
• drivers/pinctrl/imx-iomux-v2.c
• drivers/pinctrl/imx-iomux-v3.c
• drivers/pinctrl/pinctrl.c
• include/of.h
• include/pinctrl.h

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

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

Show notes View arch/arm/mach-imx/iomux-v1.c 100644 → 0

Show notes View arch/arm/mach-imx/iomux-v2.c 100644 → 0

Show notes View arch/arm/mach-imx/iomux-v3.c 100644 → 0

Ignore Space Show notes View drivers/Kconfig

Ignore Space Show notes View drivers/Makefile

Ignore Space Show notes View drivers/base/driver.c

Ignore Space Show notes View drivers/of/base.c

Ignore Space Show notes View drivers/of/partition.c

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

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

Ignore Space Show notes View drivers/pinctrl/imx-iomux-v1.c 0 → 100644

Ignore Space Show notes View drivers/pinctrl/imx-iomux-v2.c 0 → 100644

Ignore Space Show notes View drivers/pinctrl/imx-iomux-v3.c 0 → 100644

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

Ignore Space Show notes View include/of.h

Ignore Space Show notes View include/pinctrl.h 0 → 100644

Show line notes below