Merge branch 'for-next/misc'
Conflicts:
	arch/arm/boards/chumby_falconwing/falconwing.c
	arch/arm/boards/imx233-olinuxino/imx23-olinuxino.c
	arch/x86/mach-x86.dox
	scripts/setupmbr/setupmbr.c
commit efa4d684d8927428d333f841e37adeedcfe61cfb
2 parents 45d593b + 10d6391
@Sascha Hauer Sascha Hauer authored on 4 Jul 2014
Showing 61 changed files
View
arch/arm/boards/archosg9/env/boot/sd-card-android
View
arch/arm/boards/archosg9/env/boot/sd-card-linux
View
arch/arm/boards/archosg9/env/boot/usb-android
View
arch/arm/boards/archosg9/env/boot/usb-linux
View
arch/arm/boards/at91sam9m10ihd/env/boot/android
View
arch/arm/boards/at91sam9m10ihd/env/boot/mmc
View
arch/arm/boards/at91sam9m10ihd/env/boot/net
View
arch/arm/boards/at91sam9m10ihd/env/boot/net-usb
View
arch/arm/boards/beagle/env/boot/mmc
View
arch/arm/boards/beagle/env/boot/nand-ubi
View
arch/arm/boards/beagle/env/boot/nand-ubi-dt
View
arch/arm/boards/beaglebone/defaultenv-beaglebone/boot/sd
View
arch/arm/boards/beaglebone/defaultenv-beaglebone/config 100644 → 0
View
arch/arm/boards/beaglebone/defaultenv-beaglebone/init/usb-limit-1300 0 → 100644
View
arch/arm/boards/ccxmx51/env/boot/nand
View
arch/arm/boards/clep7212/env/boot/nor
View
arch/arm/boards/crystalfontz-cfa10036/env/boot/mmc-ext3
View
arch/arm/boards/datamodul-edm-qmx6/env/boot/mmc
View
arch/arm/boards/delphi-poc20/env/boot/mmc
View
arch/arm/boards/efika-mx-smartbook/env/boot/hd-internal
View
arch/arm/boards/efika-mx-smartbook/env/boot/mmc-left
View
arch/arm/boards/freescale-mx23-evk/mx23-evk.c
View
arch/arm/boards/friendlyarm-mini2440/env/boot/nand
View
arch/arm/boards/guf-vincell/env/boot/nand-ubi
View
arch/arm/boards/highbank/env/boot/ahci
View
arch/arm/boards/highbank/env/boot/ahci-boot
View
arch/arm/boards/highbank/env/boot/mmc
View
arch/arm/boards/highbank/env/boot/mmc-boot
View
arch/arm/boards/highbank/env/boot/net
View
arch/arm/boards/highbank/env/boot/net-eth1
View
arch/arm/boards/karo-tx25/env/boot/nand-ubi
View
arch/arm/boards/mx31moboard/env/boot/nor
View
arch/arm/boards/mx31moboard/env/boot/sd
View
arch/arm/boards/mx31moboard/env/boot/usbmsd
View
arch/arm/boards/panda/env/boot/mmc
View
arch/arm/boards/phytec-phycard-imx6/env/boot/nand
View
arch/arm/boards/phytec-phycard-imx6/env/boot/sd-ext3
View
arch/arm/boards/phytec-phycore-am335x/defaultenv-phycore-am335x/boot/mmc
View
arch/arm/boards/phytec-phycore-am335x/defaultenv-phycore-am335x/boot/nand
View
arch/arm/boards/phytec-phycore-am335x/defaultenv-phycore-am335x/boot/spi
View
arch/arm/boards/phytec-phycore-imx27/defaultenv-pcm038/boot/nand-ubi
View
arch/arm/boards/phytec-phycore-imx31/env/boot/nand-ubi
View
arch/arm/boards/phytec-phycore-imx35/env/boot/nand-ubi
View
arch/arm/boards/telit-evk-pro3/env/boot/nand-ubi
View
arch/ppc/mach-mpc5xxx/include/mach/sdma.h
View
arch/sandbox/include/asm/bitops.h
View
arch/x86/lib/barebox.lds.S
View
arch/x86/mach-i386/include/mach/barebox.lds.h
View
commands/boot.c
View
commands/ls.c
View
commands/miitool.c
View
common/resource.c
View
defaultenv/defaultenv-2-base/boot/net
View
defaultenv/defaultenv-2-base/data/boot-template
View
defaultenv/defaultenv-2-dfu/boot/dfu
View
include/stringlist.h
View
lib/lz4/lz4_decompress.c
View
lib/lzo/lzo1x_decompress_safe.c
View
lib/stringlist.c
View
scripts/setupmbr/setupmbr.c
View
scripts/tegra/.gitignore 0 → 100644