Greg Kroah-Hartman 61906313bd Merge 3.4-rc6 into usb-next ...

This resolves the conflict with:
	drivers/usb/host/ehci-tegra.c

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

2012-05-07 09:03:39 -07:00

..

asix.c

asix: Fix tx transfer padding for full-speed USB

2012-04-24 04:11:34 -04:00

catc.c

USB: catc.c: remove err() usage

2012-04-25 12:37:47 -07:00

cdc_eem.c

net: usb: cdc_eem: fix mtu

2012-04-01 23:32:35 -04:00

cdc_ether.c

Move Logitech Harmony 900 from cdc_ether to zaurus

2012-02-22 15:50:23 -05:00

cdc_ncm.c

cdc_ncm: avoid discarding datagrams in rx path

2012-03-16 02:08:36 -07:00

cdc_subset.c

…

cdc-phonet.c

cdc-phonet: fix skb truesize underestimation

2012-03-27 22:50:55 -04:00

cx82310_eth.c

…

dm9601.c

…

gl620a.c

…

hso.c

Merge tag 'tty-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty

2012-03-20 11:24:39 -07:00

int51x1.c

…

ipheth.c

USB: ipheth.c: remove err() usage

2012-04-25 12:37:48 -07:00

kalmia.c

…

kaweth.c

USB: kaweth.c: remove err() usage

2012-04-25 12:37:48 -07:00

Kconfig

net: qmi_wwan: fix build error due to cdc-wdm dependecy

2012-03-19 18:17:18 -04:00

lg-vl600.c

…

Makefile

net: usb: qmi_wwan: New driver for Huawei QMI based WWAN devices

2012-03-09 13:09:17 -08:00

mcs7830.c

mcs7830: unify return value of .ndo_set_mac_address if address is invalid

2012-02-23 17:03:20 -05:00

net1080.c

…

pegasus.c

drivers/net: Remove alloc_etherdev error messages

2012-01-31 16:20:48 -05:00

pegasus.h

…

plusb.c

…

qmi_wwan.c

net: qmi_wwan: support Sierra Wireless MC77xx devices in QMI mode

2012-04-19 15:26:42 -04:00

rndis_host.c

…

rtl8150.c

USB: rtl8150.c: remove err() usage

2012-04-25 12:37:49 -07:00

sierra_net.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2012-01-09 14:46:52 -08:00

smsc75xx.c

smsc75xx: enable mac to detect speed/duplex from phy

2012-04-30 21:52:42 -04:00

smsc75xx.h

…

smsc95xx.c

smsc95xx: mark link down on startup and let PHY interrupt deal with carrier changes

2012-04-26 05:56:03 -04:00

smsc95xx.h

…

usbnet.c

usbnet: fix failure handling in usbnet_probe

2012-05-02 20:13:04 -04:00

zaurus.c

USB: Add Motorola Rokr E6 Id to the USBNet driver "zaurus"

2012-03-27 22:39:46 -04:00