Merge branch 'master' of git://git.denx.de/u-boot-usb

diff --combined cmd/Kconfig
index 51db3da,b667df8..04bdbf0
--- 1/cmd/Kconfig
--- 2/cmd/Kconfig
+++ b/cmd/Kconfig
@@@ -254,14 -254,6 +254,14 @@@ config CMD_BOOTMEN
        help
          Add an ANSI terminal boot menu command.
  
 +config CMD_DTIMG
 +      bool "dtimg"
 +      help
 +        Android DTB/DTBO image manipulation commands. Read dtb/dtbo files from
 +        image into RAM, dump image structure information, etc. Those dtb/dtbo
 +        files should be merged in one dtb further, which needs to be passed to
 +        the kernel, as part of a boot process.
 +
  config CMD_ELF
        bool "bootelf, bootvx"
        default y
@@@ -615,6 -607,15 +615,15 @@@ config CMD_AD
          Shows ADC device info and permit printing one-shot analog converted
          data from a named Analog to Digital Converter.
  
+ config CMD_BIND
+       bool "bind/unbind - Bind or unbind a device to/from a driver"
+       depends on DM
+       help
+         Bind or unbind a device to/from a driver from the command line.
+         This is useful in situations where a device may be handled by several
+         drivers. For example, this can be used to bind a UDC to the usb ether
+         gadget driver from the command line.
+ 
  config CMD_CLK
        bool "clk - Show clock frequencies"
        help

diff --combined cmd/Makefile
index b1206fc,ef02135..3487c80
--- 1/cmd/Makefile
--- 2/cmd/Makefile
+++ b/cmd/Makefile
@@@ -19,6 -19,7 +19,7 @@@ obj-$(CONFIG_SOURCE) += source.
  obj-$(CONFIG_CMD_SOURCE) += source.o
  obj-$(CONFIG_CMD_BDI) += bdinfo.o
  obj-$(CONFIG_CMD_BEDBUG) += bedbug.o
+ obj-$(CONFIG_CMD_BIND) += bind.o
  obj-$(CONFIG_CMD_BINOP) += binop.o
  obj-$(CONFIG_CMD_BLOCK_CACHE) += blkcache.o
  obj-$(CONFIG_CMD_BMP) += bmp.o
@@@ -43,7 -44,6 +44,7 @@@ ifdef CONFIG_POS
  obj-$(CONFIG_CMD_DIAG) += diag.o
  endif
  obj-$(CONFIG_CMD_DISPLAY) += display.o
 +obj-$(CONFIG_CMD_DTIMG) += dtimg.o
  obj-$(CONFIG_CMD_ECHO) += echo.o
  obj-$(CONFIG_ENV_IS_IN_EEPROM) += eeprom.o
  obj-$(CONFIG_CMD_EEPROM) += eeprom.o