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

commit 6e30646fa28908b3f199d070ebb85151fef52a10 2 parents 904298d + f93b5f8 Sascha Hauer authored on 7 Oct 2013

Showing 19 changed files

• arch/arm/Kconfig
• arch/arm/boards/Makefile
• arch/arm/boards/toradex-colibri-t20-iris/Makefile
• arch/arm/boards/toradex-colibri-t20-iris/entry.c
• arch/arm/boards/toshiba-ac100/Kconfig
• arch/arm/boards/toshiba-ac100/Makefile
• arch/arm/boards/toshiba-ac100/entry.c
• arch/arm/configs/tegra20_colibri_iris_defconfig
• arch/arm/configs/tegra_v7_defconfig
• arch/arm/configs/toshiba_ac100_defconfig
• arch/arm/dts/Makefile
• arch/arm/mach-tegra/Kconfig
• arch/arm/mach-tegra/Makefile
• arch/arm/mach-tegra/include/mach/lowlevel.h
• arch/arm/mach-tegra/include/mach/tegra20-pmc.h
• arch/arm/mach-tegra/tegra_avp_init.c
• arch/arm/mach-tegra/tegra_maincomplex_init.c
• images/Makefile
• images/Makefile.tegra

Ignore Space Show notes View arch/arm/Kconfig

Ignore Space Show notes View arch/arm/boards/Makefile

Ignore Space Show notes View arch/arm/boards/toradex-colibri-t20-iris/Makefile 0 → 100644

Ignore Space Show notes View arch/arm/boards/toradex-colibri-t20-iris/entry.c 0 → 100644

Show notes View arch/arm/boards/toshiba-ac100/Kconfig 100644 → 0

Ignore Space Show notes View arch/arm/boards/toshiba-ac100/Makefile

Ignore Space Show notes View arch/arm/boards/toshiba-ac100/entry.c 0 → 100644

Show notes View arch/arm/configs/tegra20_colibri_iris_defconfig 100644 → 0

Ignore Space Show notes View arch/arm/configs/tegra_v7_defconfig 0 → 100644

Show notes View arch/arm/configs/toshiba_ac100_defconfig 100644 → 0

Ignore Space Show notes View arch/arm/dts/Makefile

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

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

Ignore Space Show notes View arch/arm/mach-tegra/include/mach/lowlevel.h

Ignore Space Show notes View arch/arm/mach-tegra/include/mach/tegra20-pmc.h

Ignore Space Show notes View arch/arm/mach-tegra/tegra_avp_init.c

Ignore Space Show notes View arch/arm/mach-tegra/tegra_maincomplex_init.c

Ignore Space Show notes View images/Makefile

Ignore Space Show notes View images/Makefile.tegra 0 → 100644

Show line notes below