Merge branch 'for-next/misc'
Conflicts:
	commands/Makefile
commit 33c56e21eb3bf841c79d9c8a40dedc8b16b774f2
2 parents d32008b + ce8f489
@Sascha Hauer Sascha Hauer authored on 7 Oct 2013
Showing 28 changed files
View
arch/arm/pbl/Makefile
View
commands/Makefile
View
commands/crc.c
View
commands/devinfo.c 0 → 100644
View
commands/ubi.c
View
common/globalvar.c
View
common/hush.c
View
common/parser.c
View
defaultenv-2/base/bin/init
View
drivers/base/driver.c
View
drivers/usb/core/usb.c
View
drivers/usb/host/ehci-hcd.c
View
drivers/usb/host/ohci-hcd.c
View
include/shell.h 0 → 100644
View
include/usb/usb.h
View
lib/process_escape_sequence.c
View
scripts/.gitignore
View
scripts/Makefile
View
scripts/bareboxenv.c
View
scripts/fix_size.c 0 → 100644
View
scripts/omap4_usbboot.c 100644 → 0
View
scripts/omap4_usbboot/.gitignore 0 → 100644
View
scripts/omap4_usbboot/Makefile 0 → 100644
View
scripts/omap4_usbboot/omap4_usbboot.c 0 → 100644
View
scripts/omap4_usbboot/usb.h 0 → 100644
View
scripts/omap4_usbboot/usb_linux.c 0 → 100644
View
scripts/usb.h 100644 → 0
View
scripts/usb_linux.c 100644 → 0