Merge branch 'for-next/of'
Conflicts:
	arch/arm/boards/freescale-mx53-loco/board.c
	drivers/of/Makefile
commit fbf082b56540b4f3853015f3686c8f106a91707a
2 parents 8c5a1c0 + 6a37488
@Sascha Hauer Sascha Hauer authored on 5 Aug 2013
Showing 33 changed files
View
Documentation/devicetree/bindings/barebox.txt 0 → 100644
View
Documentation/devicetree/bindings/barebox/barebox,environment.txt 0 → 100644
View
Documentation/devicetree/bindings/leds/common.txt 0 → 100644
View
arch/arm/boards/dmo-mx6-realq7/board.c
View
arch/arm/boards/efika-mx-smartbook/board.c
View
arch/arm/boards/freescale-mx51-pdk/board.c
View
arch/arm/configs/dmo-realq7_defconfig
View
arch/arm/dts/imx51-babbage.dts
View
arch/arm/dts/imx51-genesi-efika-sb.dts
View
arch/arm/dts/imx53-qsb.dts
View
arch/arm/dts/imx6q-dmo-realq7.dts
View
arch/x86/boards/x86_generic/generic_pc.c
View
commands/partition.c
View
common/environment.c
View
common/partitions.c
View
drivers/Kconfig
View
drivers/Makefile
View
drivers/bus/Kconfig 0 → 100644
View
drivers/bus/Makefile 0 → 100644
View
drivers/bus/imx-weim.c 0 → 100644
View
drivers/led/Kconfig
View
drivers/led/led-gpio.c
View
drivers/mci/mci-core.c
View
drivers/mtd/core.c
View
drivers/of/Kconfig
View
drivers/of/Makefile
View
drivers/of/barebox.c 0 → 100644
View
drivers/of/base.c
View
drivers/of/of_path.c 0 → 100644
View
drivers/of/partition.c
View
fs/devfs-core.c
View
include/driver.h
View
include/of.h