David S. Miller 26440c835f Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Conflicts:
	drivers/net/usb/asix_common.c
	net/ipv4/inet_connection_sock.c
	net/switchdev/switchdev.c

In the inet_connection_sock.c case the request socket hashing scheme
is completely different in net-next.

The other two conflicts were overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>

2015-10-20 06:08:27 -07:00

..

association.h

…

atmel_usba_udc.h

…

audio-v2.h

…

audio.h

…

c67x00.h

…

cdc_ncm.h

cdc_ncm: Add support for moving NDP to end of NCM frame

2015-07-09 14:58:31 -07:00

cdc-wdm.h

…

cdc.h

cdc: add header guards

2015-09-15 21:53:24 -07:00

ch9.h

…

chipidea.h

Merge tag 'usb-ci-v4.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb into usb-next

2015-08-14 16:43:09 -07:00

composite.h

usb: composite: add bind_deactivated flag to usb_function

2015-07-29 09:59:19 -05:00

ehci_def.h

…

ehci_pdriver.h

…

ehci-dbgp.h

…

ezusb.h

…

functionfs.h

…

g_hid.h

…

gadget_configfs.h

…

gadget.h

usb: gadget: move find_ep() from epautoconf to udc-core

2015-08-06 09:33:14 -05:00

gpio_vbus.h

…

hcd.h

Revert "usb: interface authorization: Introduces the default interface authorization"

2015-08-18 09:58:45 -07:00

input.h

…

iowarrior.h

…

irda.h

…

isp116x.h

…

isp1301.h

…

isp1362.h

…

isp1760.h

…

m66592.h

…

msm_hsusb_hw.h

…

msm_hsusb.h

usb: phy: msm: Add D+/D- lines route control

2015-07-30 11:43:36 -05:00

musb-omap.h

…

musb-ux500.h

…

musb.h

…

net2280.h

…

of.h

usb: common: add API to update usb otg capabilities by device tree

2015-07-29 09:59:21 -05:00

ohci_pdriver.h

…

otg-fsm.h

…

otg.h

usb: otg: add usb_otg_caps structure for otg capabilities

2015-07-29 09:59:20 -05:00

phy_companion.h

…

phy.h

…

quirks.h

…

r8a66597.h

…

renesas_usbhs.h

usb: renesas_usbhs: fix build warning if 64-bit architecture

2015-09-30 11:21:03 -05:00

rndis_host.h

…

samsung_usb_phy.h

…

serial.h

…

sl811.h

…

storage.h

…

tegra_usb_phy.h

…

tilegx.h

…

uas.h

…

ulpi.h

…

usb338x.h

…

usb_phy_generic.h

…

usbnet.h

…

wusb-wa.h

…

wusb.h

…

xhci_pdriver.h

…