Merge branch 'for-next/omap'
Conflicts:
	arch/arm/boards/beagle/board.c
commit 18ea2863bf76d6cd81c83706b5eb180dc5ad23bc
2 parents c408a4e + 893f30f
@Sascha Hauer Sascha Hauer authored on 3 Jul 2015
Showing 32 changed files
View
arch/arm/boards/beagle/Makefile
View
arch/arm/boards/beagle/board.c
View
arch/arm/boards/beagle/defaultenv-beagle/boot/mmc 0 → 100644
View
arch/arm/boards/beagle/defaultenv-beagle/boot/nand-ubi 0 → 100644
View
arch/arm/boards/beagle/defaultenv-beagle/boot/nand-ubi-dt 0 → 100644
View
arch/arm/boards/beagle/defaultenv-beagle/init/mtdparts-nand 0 → 100644
View
arch/arm/boards/beagle/defaultenv-beagle/network/eth0-discover 0 → 100644
View
arch/arm/boards/beagle/env/boot/mmc 100644 → 0
View
arch/arm/boards/beagle/env/boot/nand-ubi 100644 → 0
View
arch/arm/boards/beagle/env/boot/nand-ubi-dt 100644 → 0
View
arch/arm/boards/beagle/env/init/mtdparts-nand 100644 → 0
View
arch/arm/boards/beagle/env/network/eth0-discover 100644 → 0
View
arch/arm/boards/beagle/lowlevel.c
View
arch/arm/configs/omap3530_beagle_defconfig
View
arch/arm/configs/omap3530_beagle_xload_defconfig
View
arch/arm/configs/phytec-phycard-omap3_defconfig
View
arch/arm/cpu/start.c
View
arch/arm/include/asm/barebox-arm.h
View
arch/arm/mach-omap/Kconfig
View
arch/arm/mach-omap/Makefile
View
arch/arm/mach-omap/include/mach/omap3-clock.h
View
arch/arm/mach-omap/include/mach/omap3-generic.h
View
arch/arm/mach-omap/omap3_generic.c
View
arch/arm/mach-omap/omap3_xload_usb.c 0 → 100644
View
arch/arm/mach-omap/xload.c
View
drivers/bus/omap-gpmc.c
View
drivers/of/platform.c
View
images/Makefile
View
images/Makefile.omap3 0 → 100644
View
include/of.h
View
scripts/Makefile
View
scripts/omap3-usb-loader.c 0 → 100644