Merge remote-tracking branch 'usb/usb-next'

Conflicts:
	include/scsi/scsi_device.h

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

diff --cc drivers/power/pda_power.c
Simple merge

diff --cc drivers/power/twl4030_charger.c
Simple merge

diff --cc drivers/usb/class/cdc-acm.c
Simple merge

diff --cc drivers/usb/gadget/Kconfig
Simple merge

diff --cc drivers/usb/gadget/omap_udc.c
Simple merge

diff --cc drivers/usb/gadget/u_ether.c
Simple merge

diff --cc drivers/usb/host/Kconfig
Simple merge

diff --cc drivers/usb/host/ehci-hcd.c
Simple merge

diff --cc drivers/usb/host/ehci-tegra.c
Simple merge

diff --cc drivers/usb/host/ohci-omap.c
index b02c344e2cc928b652e6af5358474647d81c4ba9,076d2018e6df752e4b3e1c30c3aa4f7598889797..e7d75d295988c3fabc64c36fdf6d1db23f70b7d0
--- 1/drivers/usb/host/ohci-omap.c
--- 2/drivers/usb/host/ohci-omap.c
+++ b/drivers/usb/host/ohci-omap.c
@@@ -18,8 -18,10 +18,9 @@@
  #include <linux/jiffies.h>
  #include <linux/platform_device.h>
  #include <linux/clk.h>
+ #include <linux/err.h>
  #include <linux/gpio.h>
  
 -#include <mach/hardware.h>
  #include <asm/io.h>
  #include <asm/mach-types.h>
  

diff --cc drivers/usb/otg/isp1301_omap.c
Simple merge

diff --cc drivers/usb/renesas_usbhs/fifo.c
Simple merge

diff --cc drivers/usb/serial/keyspan.c
index 6225199119c0c8edba22db13b9dd91ac746e5e44,af0b70eaf032f6617c36b596ce70776842a20d9f..7bcbb47e1449a83b210f9d280d5f60c965607641
--- 1/drivers/usb/serial/keyspan.c
--- 2/drivers/usb/serial/keyspan.c
+++ b/drivers/usb/serial/keyspan.c
@@@ -176,10 -176,10 +176,10 @@@ static void keyspan_set_termios(struct 
        tty_encode_baud_rate(tty, baud_rate, baud_rate);
        /* set CTS/RTS handshake etc. */
        p_priv->cflag = cflag;
-       p_priv->flow_control = (cflag & CRTSCTS)? flow_cts: flow_none;
+       p_priv->flow_control = (cflag & CRTSCTS) ? flow_cts : flow_none;
  
        /* Mark/Space not supported */
 -      tty->termios->c_cflag &= ~CMSPAR;
 +      tty->termios.c_cflag &= ~CMSPAR;
  
        keyspan_send_setup(port, 0);
  }

diff --cc drivers/usb/serial/quatech2.c
Simple merge

diff --cc drivers/usb/serial/sierra.c
Simple merge