Merge branch 'for-tony' of master.kernel.org:/pub/scm/linux/kernel/git/balbi/usb...

diff --cc arch/arm/mach-omap2/board-am3517evm.c
Simple merge

diff --cc arch/arm/mach-omap2/usb-musb.c
index dfa5a3cb5a17f87d259fdd9283b40b30c69a0028,fd95e62e8fcf11c5ad55dc55deb00b5380c257c2..c7ed540d868d218a56a1b4c07db3b417a2f91845
--- 1/arch/arm/mach-omap2/usb-musb.c
--- 2/arch/arm/mach-omap2/usb-musb.c
+++ b/arch/arm/mach-omap2/usb-musb.c
@@@ -122,18 -116,7 +122,13 @@@ void __init usb_musb_init(struct omap_m
        struct device                   *dev;
        int                             bus_id = -1;
        const char                      *oh_name, *name;
 +      struct omap_musb_board_data     *board_data;
 +
 +      if (musb_board_data)
 +              board_data = musb_board_data;
 +      else
 +              board_data = &musb_default_board_data;
  
-       if (cpu_is_omap3517() || cpu_is_omap3505()) {
-       } else if (cpu_is_omap44xx()) {
-               usb_musb_mux_init(board_data);
-       }
- 
        /*
         * REVISIT: This line can be removed once all the platforms using
         * musb_core.c have been converted to use use clkdev.