Merge branch 'for-next/imx-phyflex'
Conflicts:
	arch/arm/boards/phytec-phyflex-imx6/board.c
commit 3753efa4271d674d9b3cc77a0e405b38711ac505
2 parents 4997646 + 4c65c20
@Sascha Hauer Sascha Hauer authored on 4 Apr 2014
Showing 21 changed files
View
arch/arm/boards/phytec-phyflex-imx6/Makefile
View
arch/arm/boards/phytec-phyflex-imx6/board.c
View
arch/arm/boards/phytec-phyflex-imx6/flash-header-phytec-pfla02-1gib.imxcfg
View
arch/arm/boards/phytec-phyflex-imx6/flash-header-phytec-pfla02-2gib.imxcfg
View
arch/arm/boards/phytec-phyflex-imx6/flash-header-phytec-pfla02-4gib.imxcfg 0 → 100644
View
arch/arm/boards/phytec-phyflex-imx6/flash-header-phytec-pfla02.h
View
arch/arm/boards/phytec-phyflex-imx6/flash-header-phytec-pfla02dl-1gib.imxcfg 0 → 100644
View
arch/arm/boards/phytec-phyflex-imx6/flash-header-phytec-pfla02dl.h 0 → 100644
View
arch/arm/boards/phytec-phyflex-imx6/flash-header-phytec-pfla02s-512mb.imxcfg 0 → 100644
View
arch/arm/boards/phytec-phyflex-imx6/lowlevel.c
View
arch/arm/dts/Makefile
View
arch/arm/dts/imx6dl-phytec-pbab01.dts 0 → 100644
View
arch/arm/dts/imx6dl-phytec-pfla02.dtsi 0 → 100644
View
arch/arm/dts/imx6q-phytec-pbab01.dts
View
arch/arm/dts/imx6q-phytec-pfla02.dtsi
View
arch/arm/dts/imx6qdl-phytec-pbab01.dtsi 0 → 100644
View
arch/arm/dts/imx6qdl-phytec-pfla02.dtsi 0 → 100644
View
arch/arm/dts/imx6s-phytec-pbab01.dts 0 → 100644
View
arch/arm/dts/imx6s-phytec-pfla02.dtsi 0 → 100644
View
arch/arm/mach-imx/Kconfig
View
images/Makefile.imx