linux_old1/include/linux/usb
David S. Miller d4185bbf62 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c

Minor conflict between the BCM_CNIC define removal in net-next
and a bug fix added to net.  Based upon a conflict resolution
patch posted by Stephen Rothwell.

Signed-off-by: David S. Miller <davem@davemloft.net>
2012-11-10 18:32:51 -05:00
..
Kbuild UAPI: (Scripted) Disintegrate include/linux/usb 2012-10-09 09:49:07 +01:00
association.h
atmel_usba_udc.h
audio-v2.h
audio.h UAPI: (Scripted) Disintegrate include/linux/usb 2012-10-09 09:49:07 +01:00
c67x00.h
cdc-wdm.h
cdc_ncm.h net: cdc_mbim: adding MBIM driver 2012-10-23 02:40:11 -04:00
ch9.h UAPI: (Scripted) Disintegrate include/linux/usb 2012-10-09 09:49:07 +01:00
chipidea.h usb: chipidea: permit driver bindings pass phy pointer 2012-07-09 09:59:23 -07:00
composite.h usb: gadget: remove usb_gadget_controller_number() 2012-09-10 16:43:24 +03:00
ehci_def.h USB: EHCI: Tegra: Fix wrong register definition 2012-09-18 17:40:56 +01:00
ehci_pdriver.h usb: host: ehci-platform: add platform specific power callback 2012-08-10 12:05:32 -07:00
ezusb.h USB: ezusb: add support for Cypress FX2LP 2012-09-18 17:23:47 +01:00
functionfs.h UAPI: (Scripted) Disintegrate include/linux/usb 2012-10-09 09:49:07 +01:00
g_hid.h
gadget.h usb: gadget: move global vars from epautoconf into struct usb_gadget 2012-09-10 15:37:08 +03:00
gpio_vbus.h
hcd.h usb: hcd: use *resource_size_t* for specifying resource data 2012-08-16 14:04:14 -07:00
input.h
intel_mid_otg.h
iowarrior.h
irda.h
isp116x.h
isp1301.h
isp1362.h
isp1760.h
m66592.h
msm_hsusb.h
msm_hsusb_hw.h
musb-omap.h usb: musb: twl: use mailbox API to send VBUS or ID events 2012-06-25 14:07:39 +03:00
musb.h
net2280.h
nop-usb-xceiv.h usb: xceiv: nop: let it work as USB2 and USB3 phy 2012-08-03 09:36:19 +03:00
ohci_pdriver.h usb: host: ohci-platform: add platform specific power callback 2012-08-10 12:05:32 -07:00
omap_usb.h usb: phy: add a new driver for omap usb2 phy 2012-09-06 20:14:53 +03:00
otg.h usb: phy: fix build break 2012-09-06 16:01:11 +03:00
phy.h usb: phy: fix build break 2012-09-06 16:01:11 +03:00
phy_companion.h usb: phy: add a new driver for omap usb2 phy 2012-09-06 20:14:53 +03:00
quirks.h usb: convert USB_QUIRK_RESET_MORPHS to USB_QUIRK_RESET 2012-08-20 14:38:08 -07:00
r8a66597.h
renesas_usbhs.h usb: renesas_usbhs: add DMAEngine ID specification note 2012-06-13 12:38:36 -07:00
rndis_host.h
serial.h USB: ezusb: add support for Cypress FX2LP 2012-09-18 17:23:47 +01:00
sl811.h
storage.h
tegra_usb_phy.h usb: move phy driver from mach-tegra to drivers/usb 2012-09-05 16:43:57 +03:00
tilegx.h usb: add host support for the tilegx architecture 2012-07-18 16:40:29 -04:00
uas.h uas: task mgmt & error handling 2012-06-25 11:51:01 -07:00
ulpi.h
usbnet.h usbnet: introduce usbnet_{read|write}_cmd_nopm 2012-11-07 03:53:38 -05:00
wusb-wa.h
wusb.h