Merge branch 'for-next/imx-oftree'
Conflicts:
	arch/arm/boards/freescale-mx51-pdk/board.c
commit 064fdcec9f72fa6616dc4d3bcf340705f27e5fe1
2 parents f56b064 + 1906b87
@Sascha Hauer Sascha Hauer authored on 2 Jun 2013
Showing 37 changed files
View
Documentation/devicetree/bindings/README 0 → 100644
View
Documentation/devicetree/bindings/misc/fsl,imx-iim.txt 0 → 100644
View
arch/arm/Makefile
View
arch/arm/boards/freescale-mx51-pdk/board.c
View
arch/arm/boards/freescale-mx6-sabrelite/board.c
View
arch/arm/boards/freescale-mx6-sabresd/board.c
View
arch/arm/configs/freescale-mx6-sabrelite_defconfig
View
arch/arm/configs/freescale_mx51_babbage_defconfig
View
arch/arm/dts/Makefile
View
arch/arm/dts/imx51-babbage.dts 0 → 100644
View
arch/arm/dts/imx51-pinfunc.h 0 → 100644
View
arch/arm/dts/imx51.dtsi 0 → 100644
View
arch/arm/dts/imx6q-pinfunc.h 0 → 100644
Too large (Show diff)
View
arch/arm/dts/imx6q-sabrelite.dts 0 → 100644
View
arch/arm/dts/imx6q-sabresd.dts 0 → 100644
View
arch/arm/dts/imx6q.dtsi 0 → 100644
View
arch/arm/dts/imx6qdl-sabresd.dtsi 0 → 100644
View
arch/arm/dts/imx6qdl.dtsi 0 → 100644
View
arch/arm/mach-imx/Kconfig
View
arch/arm/mach-imx/clk-imx6.c
View
arch/arm/mach-imx/iim.c
View
arch/arm/mach-imx/imx25.c
View
arch/arm/mach-imx/imx51.c
View
arch/arm/mach-imx/imx6.c
View
arch/arm/mach-imx/include/mach/iim.h
View
drivers/mtd/devices/m25p80.c
View
drivers/mtd/devices/mtd_dataflash.c
View
drivers/net/fec_imx.c
View
drivers/of/base.c
View
drivers/pinctrl/imx-iomux-v3.c
View
drivers/spi/spi.c
View
include/driver.h
View
include/net.h
View
include/of.h
View
net/eth.c
View
scripts/Makefile.lib
View
scripts/basic/fixdep.c