Browse code Merge branch 'for-next/resource-size' Conflicts: drivers/base/resource.c fs/fs.c 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 v2012.08.0

commit 1510c57e93fdfdc8f5f6f6b2bbce44ac9a313172 2 parents 8c3daad + 5f03074 Sascha Hauer authored on 2 Jul 2012

Showing 23 changed files

• arch/arm/boards/nhk8815/setup.c
• arch/arm/boards/pcm038/pcm970.c
• arch/arm/lib/bootm.c
• arch/arm/mach-at91/at91sam9260_devices.c
• arch/arm/mach-at91/at91sam9263_devices.c
• arch/arm/mach-at91/at91sam9g45_devices.c
• arch/arm/mach-at91/at91sam9x5_devices.c
• arch/arm/mach-imx/include/mach/devices-imx51.h
• arch/arm/mach-imx/include/mach/devices-imx53.h
• arch/nios2/boards/generic/generic.c
• commands/bootm.c
• commands/iomem.c
• commands/mem.c
• common/memory.c
• common/resource.c
• common/uimage.c
• drivers/base/driver.c
• drivers/base/resource.c
• drivers/usb/host/ohci-at91.c
• drivers/video/fb.c
• fs/devfs.c
• fs/fs.c
• include/linux/ioport.h

Ignore Space Show notes View arch/arm/boards/nhk8815/setup.c

Ignore Space Show notes View arch/arm/boards/pcm038/pcm970.c

Ignore Space Show notes View arch/arm/lib/bootm.c

Ignore Space Show notes View arch/arm/mach-at91/at91sam9260_devices.c

Ignore Space Show notes View arch/arm/mach-at91/at91sam9263_devices.c

Ignore Space Show notes View arch/arm/mach-at91/at91sam9g45_devices.c

Ignore Space Show notes View arch/arm/mach-at91/at91sam9x5_devices.c

Ignore Space Show notes View arch/arm/mach-imx/include/mach/devices-imx51.h

Ignore Space Show notes View arch/arm/mach-imx/include/mach/devices-imx53.h

Ignore Space Show notes View arch/nios2/boards/generic/generic.c

Ignore Space Show notes View commands/bootm.c

Ignore Space Show notes View commands/iomem.c

Ignore Space Show notes View commands/mem.c

Ignore Space Show notes View common/memory.c

Ignore Space Show notes View common/resource.c

Ignore Space Show notes View common/uimage.c

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

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

Ignore Space Show notes View drivers/usb/host/ohci-at91.c

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

Ignore Space Show notes View fs/devfs.c

Ignore Space Show notes View fs/fs.c

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

Show line notes below