Merge branch 'for-next/imx'
Conflicts:
	arch/arm/Makefile
commit f56b064fa3d91afdf06d6a48e18063cfd3f0efe5
2 parents 619fdd0 + 2f228f7
@Sascha Hauer Sascha Hauer authored on 2 Jun 2013
Showing 17 changed files
View
arch/arm/Makefile
View
arch/arm/boards/freescale-mx51-pdk/Makefile
View
arch/arm/boards/freescale-mx51-pdk/board.c
View
arch/arm/boards/freescale-mx51-pdk/dcd-data.h 100644 → 0
View
arch/arm/boards/freescale-mx51-pdk/flash-header.imxcfg 0 → 100644
View
arch/arm/boards/freescale-mx51-pdk/flash_header.c 100644 → 0
View
arch/arm/boards/pcm038/pcm038.c
View
arch/arm/mach-imx/Kconfig
View
arch/arm/mach-imx/imx51.c
View
arch/arm/mach-imx/include/mach/imx5.h
View
scripts/Makefile
View
scripts/Makefile.lib
View
scripts/imx/.gitignore 0 → 100644
View
scripts/imx/Makefile 0 → 100644
View
scripts/imx/README 0 → 100644
View
scripts/imx/imx-image.c 0 → 100644
View
scripts/imx/imx-usb-loader.c 0 → 100644
Too large (Show diff)