Browse code Merge branch 'for-next/param' Conflicts: drivers/mci/mci-core.c 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 c19efab88606a974c050aa6caa9ec1803f88bdc9 2 parents da1ada4 + 2f24a5c Sascha Hauer authored on 6 May 2013

Showing 31 changed files

• arch/arm/boards/at91sam9m10ihd/hw_version.c
• arch/arm/boards/at91sam9x5ek/hw_version.c
• arch/arm/boards/sama5d3xek/hw_version.c
• arch/arm/mach-imx/iim.c
• arch/arm/mach-mxs/ocotp.c
• common/console.c
• drivers/amba/bus.c
• drivers/ata/disk_ata_drive.c
• drivers/input/qt1070.c
• drivers/mci/mci-core.c
• drivers/mtd/core.c
• drivers/mtd/nand/nand_base.c
• drivers/net/ksz8864rmn.c
• drivers/net/phy/mdio_bus.c
• drivers/pwm/core.c
• drivers/usb/core/usb.c
• drivers/usb/gadget/at91_udc.c
• drivers/video/fb.c
• drivers/video/imx-ipu-fb.c
• drivers/video/imx.c
• include/ata_drive.h
• include/console.h
• include/fb.h
• include/linux/mtd/mtd.h
• include/mci.h
• include/net.h
• include/param.h
• lib/parameter.c
• net/eth.c
• net/net.c
• net/netconsole.c

Ignore Space Show notes View arch/arm/boards/at91sam9m10ihd/hw_version.c

Ignore Space Show notes View arch/arm/boards/at91sam9x5ek/hw_version.c

Ignore Space Show notes View arch/arm/boards/sama5d3xek/hw_version.c

Ignore Space Show notes View arch/arm/mach-imx/iim.c

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

Ignore Space Show notes View common/console.c

Ignore Space Show notes View drivers/amba/bus.c

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

Ignore Space Show notes View drivers/input/qt1070.c

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

Ignore Space Show notes View drivers/mtd/core.c

Ignore Space Show notes View drivers/mtd/nand/nand_base.c

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

Ignore Space Show notes View drivers/net/phy/mdio_bus.c

Ignore Space Show notes View drivers/pwm/core.c

Ignore Space Show notes View drivers/usb/core/usb.c

Ignore Space Show notes View drivers/usb/gadget/at91_udc.c

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

Ignore Space Show notes View drivers/video/imx-ipu-fb.c

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

Ignore Space Show notes View include/ata_drive.h

Ignore Space Show notes View include/console.h

Ignore Space Show notes View include/fb.h

Ignore Space Show notes View include/linux/mtd/mtd.h

Ignore Space Show notes View include/mci.h

Ignore Space Show notes View include/net.h

Ignore Space Show notes View include/param.h

Ignore Space Show notes View lib/parameter.c

Ignore Space Show notes View net/eth.c

Ignore Space Show notes View net/net.c

Ignore Space Show notes View net/netconsole.c

Show line notes below