Merge branch 'for-next/samsung'
Conflicts:
	arch/arm/Makefile
	arch/arm/mach-samsung/Makefile
	arch/arm/mach-samsung/include/mach/s5pcxx-iomap.h
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
commit a934d16a2aa402f9f417f8a533ea80abcf1d2771
2 parents 33838de + d659266
@Sascha Hauer Sascha Hauer authored on 1 Aug 2012
Showing 34 changed files
View
arch/arm/Kconfig
View
arch/arm/Makefile
View
arch/arm/boards/friendlyarm-mini6410/Makefile 0 → 100644
View
arch/arm/boards/friendlyarm-mini6410/config.h 0 → 100644
View
arch/arm/boards/friendlyarm-mini6410/env/config 0 → 100644
View
arch/arm/boards/friendlyarm-mini6410/mini6410.c 0 → 100644
View
arch/arm/boards/friendlyarm-tiny6410/Kconfig 0 → 100644
View
arch/arm/boards/friendlyarm-tiny6410/Makefile 0 → 100644
View
arch/arm/boards/friendlyarm-tiny6410/config.h 0 → 100644
View
arch/arm/boards/friendlyarm-tiny6410/development-board.c 0 → 100644
View
arch/arm/boards/friendlyarm-tiny6410/env/config 0 → 100644
View
arch/arm/boards/friendlyarm-tiny6410/tiny6410.c 0 → 100644
View
arch/arm/boards/friendlyarm-tiny6410/tiny6410.h 0 → 100644
View
arch/arm/configs/friendlyarm_mini6410_defconfig 0 → 100644
View
arch/arm/configs/friendlyarm_tiny6410_defconfig 0 → 100644
View
arch/arm/mach-samsung/Kconfig
View
arch/arm/mach-samsung/Makefile
View
arch/arm/mach-samsung/clocks-s3c24xx.c 0 → 100644
View
arch/arm/mach-samsung/clocks-s3c64xx.c 0 → 100644
View
arch/arm/mach-samsung/gpio-s3c64xx.c 0 → 100644
View
arch/arm/mach-samsung/include/mach/devices-s3c64xx.h 0 → 100644
View
arch/arm/mach-samsung/include/mach/gpio.h
View
arch/arm/mach-samsung/include/mach/iomux-s3c64xx.h 0 → 100644
View
arch/arm/mach-samsung/include/mach/s3c-clocks.h
View
arch/arm/mach-samsung/include/mach/s3c-generic.h
View
arch/arm/mach-samsung/include/mach/s3c-iomap.h
View
arch/arm/mach-samsung/include/mach/s3c64xx-clocks.h 0 → 100644
View
arch/arm/mach-samsung/include/mach/s3c64xx-iomap.h 0 → 100644
View
arch/arm/mach-samsung/include/mach/s5pcxx-iomap.h
View
arch/arm/mach-samsung/mem-s3c64xx.c 0 → 100644
View
arch/arm/mach-samsung/s3c-timer.c
View
arch/arm/mach-samsung/s3c24xx-clocks.c 100644 → 0
View
drivers/serial/Kconfig
View
drivers/serial/serial_s3c.c