David S. Miller 7143b7d412 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ...

Conflicts:
	drivers/net/tg3.c

2011-05-05 14:59:02 -07:00

..

association.h

…

atmel_usba_udc.h

…

audio-v2.h

…

audio.h

…

c67x00.h

…

cdc.h

CDC NCM errata updates for cdc.h

2011-02-08 13:54:42 -08:00

ch9.h

USB: Add support for SuperSpeed isoc endpoints

2011-03-13 18:23:57 -07:00

ch11.h

USB: Remove bogus USB_PORT_STAT_SUPER_SPEED symbol.

2011-03-13 18:23:50 -07:00

composite.h

Fix common misspellings

2011-03-31 11:26:23 -03:00

ehci_def.h

Fix common misspellings

2011-03-31 11:26:23 -03:00

functionfs.h

Fix common misspellings

2011-03-31 11:26:23 -03:00

g_hid.h

…

g_printer.h

…

gadget.h

Fix common misspellings

2011-03-31 11:26:23 -03:00

gadgetfs.h

…

gpio_vbus.h

…

hcd.h

usb: Make core allocate resources per PCI-device.

2011-03-13 18:23:06 -07:00

input.h

…

intel_mid_otg.h

USB OTG: Add common data structure for Intel MID Platform (Langwell/Penwell)

2010-10-22 10:21:33 -07:00

iowarrior.h

…

irda.h

…

isp116x.h

…

isp1362.h

…

isp1760.h

…

Kbuild

USB: gadget: export functionfs.h to the includes available for userspace

2011-02-04 11:57:21 -08:00

langwell_otg.h

USB OTG Langwell: Update OTG Kconfig and driver version.

2010-10-22 10:21:33 -07:00

langwell_udc.h

…

m66592.h

…

midi.h

Fix common misspellings

2011-03-31 11:26:23 -03:00

msm_hsusb_hw.h

USB: Fix trout build failure with ci13xxx_msm gadget

2011-02-04 12:38:14 -08:00

msm_hsusb.h

USB: Rename "msm72k_otg.c" to "msm_otg.c"

2011-03-07 12:15:21 -08:00

musb.h

Merge branch 'usb-next' into musb-merge

2010-12-16 10:05:06 -08:00

net2280.h

…

otg.h

usb: otg: notifier: switch to atomic notifier

2011-02-18 14:05:54 +02:00

quirks.h

USB delay init quirk for logitech Harmony 700-series devices

2010-08-10 14:35:41 -07:00

r8a66597.h

…

rndis_host.h

rndis_host: Poll status before control channel where necessary

2011-04-13 14:48:55 -07:00

serial.h

Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6

2011-03-16 15:11:04 -07:00

sl811.h

…

storage.h

USB: Move USB Storage definitions to their own header file

2010-10-22 10:21:50 -07:00

tmc.h

…

ulpi.h

usb: otg: Add ulpi viewport access ops

2011-03-11 14:22:10 -08:00

usbnet.h

usbnet: Resubmit interrupt URB if device is open

2011-04-28 12:56:09 -07:00

video.h

…

wusb-wa.h

…

wusb.h

Fix common misspellings

2011-03-31 11:26:23 -03:00