Browse code Merge branch 'for-next/mci' Conflicts: include/driver.h WIP_next-LS master next 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

commit 8f9044927dd3c0cf9abe6c1254d76886291becbb 2 parents 89fd7e4 + 9aad0fb Sascha Hauer authored on 2 Jun 2013

Showing 34 changed files

• arch/arm/mach-bcm2835/core.c
• arch/arm/mach-omap/omap4_twl6030_mmc.c
• arch/sandbox/board/hostfile.c
• commands/Kconfig
• commands/Makefile
• commands/detect.c
• drivers/ata/ahci.c
• drivers/ata/sata-imx.c
• drivers/base/driver.c
• drivers/mci/Kconfig
• drivers/mci/Makefile
• drivers/mci/atmel_mci.c
• drivers/mci/imx-esdhc.c
• drivers/mci/imx-esdhc.h
• drivers/mci/mci-bcm2835.c
• drivers/mci/mci-bcm2835.h
• drivers/mci/mci-core.c
• drivers/mci/mxs.c
• drivers/mci/s3c.c
• drivers/mci/sdhci.h
• drivers/mci/twl6030.c
• drivers/misc/jtag.c
• drivers/mtd/nor/cfi_flash.c
• drivers/net/cs8900.c
• drivers/of/base.c
• drivers/video/fb.c
• drivers/video/s3c24xx.c
• drivers/video/stm.c
• include/driver.h
• include/mci.h
• include/mci/twl6030.h
• include/of.h
• include/param.h
• lib/parameter.c

Ignore Space Show notes View arch/arm/mach-bcm2835/core.c

Ignore Space Show notes View arch/arm/mach-omap/omap4_twl6030_mmc.c

Ignore Space Show notes View arch/sandbox/board/hostfile.c

Ignore Space Show notes View commands/Kconfig

Ignore Space Show notes View commands/Makefile

Ignore Space Show notes View commands/detect.c 0 → 100644

Ignore Space Show notes View drivers/ata/ahci.c

Ignore Space Show notes View drivers/ata/sata-imx.c

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

Ignore Space Show notes View drivers/mci/Kconfig

Ignore Space Show notes View drivers/mci/Makefile

Ignore Space Show notes View drivers/mci/atmel_mci.c

Ignore Space Show notes View drivers/mci/imx-esdhc.c

Ignore Space Show notes View drivers/mci/imx-esdhc.h

Ignore Space Show notes View drivers/mci/mci-bcm2835.c 0 → 100644

Ignore Space Show notes View drivers/mci/mci-bcm2835.h 0 → 100644

Ignore Space Show notes View drivers/mci/mci-core.c

Ignore Space Show notes View drivers/mci/mxs.c

Ignore Space Show notes View drivers/mci/s3c.c

Ignore Space Show notes View drivers/mci/sdhci.h 0 → 100644

Show notes View drivers/mci/twl6030.c 100644 → 0

Ignore Space Show notes View drivers/misc/jtag.c

Ignore Space Show notes View drivers/mtd/nor/cfi_flash.c

Ignore Space Show notes View drivers/net/cs8900.c

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

Ignore Space Show notes View drivers/video/fb.c

Ignore Space Show notes View drivers/video/s3c24xx.c

Ignore Space Show notes View drivers/video/stm.c

Ignore Space Show notes View include/driver.h

Ignore Space Show notes View include/mci.h

Show notes View include/mci/twl6030.h 100644 → 0

Ignore Space Show notes View include/of.h

Ignore Space Show notes View include/param.h

Ignore Space Show notes View lib/parameter.c

Show line notes below