黄涛 6e2688ca84 Merge remote branch 'linux-2.6.32.y/master' into develop ...

Conflicts:
	drivers/i2c/busses/Kconfig
	drivers/net/dm9000.c
	drivers/net/wireless/libertas/if_sdio1.c
	drivers/usb/serial/option.c
	net/bluetooth/rfcomm/core.c

2010-12-16 20:54:24 +08:00

..

android_composite.h

USB: gadget: f_rndis: Add platform data for RNDIS vendor ID and MAC address.

2010-03-10 18:24:20 -05:00

association.h

USB: wusb: annotate association types withe proper endianness

2009-01-07 09:59:51 -08:00

atmel_usba_udc.h

atmel_usba_udc: move endpoint declarations into platform data.

2008-04-06 17:15:08 -04:00

audio.h

USB: audio: guard kernel-only code with __KERNEL__

2009-09-23 06:46:31 -07:00

c67x00.h

USB: add Cypress c67x00 OTG controller core driver

2008-05-02 10:25:56 -07:00

cdc.h

usbnet: CDC EEM support (v5)

2009-05-04 12:01:43 -07:00

ch9.h

USB: Move vendor subclass definition from usb/audio.h to usb/ch9.h

2009-09-23 06:46:19 -07:00

composite.h

USB: composite: Add usb_composite_force_reset utility to force enumeration

2010-07-22 07:38:04 -04:00

ehci_def.h

USB: ehci-dbgp: errata for EHCI debug controller initialization

2009-09-23 06:46:38 -07:00

g_printer.h

USB: Standardize inclusion protection and add where missing.

2008-04-24 21:16:42 -07:00

gadget.h

USB: gpio_vbus: add delayed vbus_session calls

2009-03-24 16:20:26 -07:00

gadgetfs.h

headers_check fix: usb/gadgetfs.h

2009-01-30 23:37:37 +05:30

gpio_vbus.h

USB: otg: gpio_vbus transceiver stub

2009-01-07 10:00:02 -08:00

input.h

USB: Standardize inclusion protection and add where missing.

2008-04-24 21:16:42 -07:00

iowarrior.h

USB: Standardize inclusion protection and add where missing.

2008-04-24 21:16:42 -07:00

irda.h

usb: irda: cleanup on ir-usb module

2008-07-21 15:16:27 -07:00

isp116x.h

USB: Standardize inclusion protection and add where missing.

2008-04-24 21:16:42 -07:00

isp1362.h

USB: NXP ISP1362 USB host driver

2009-09-23 06:46:30 -07:00

isp1760.h

USB: isp1760: allow platform devices to customize devflags

2009-09-23 06:46:29 -07:00

Kbuild

usb: vstusb.c : new driver for spectrometers used by Vernier Software & Technology, Inc.

2008-10-17 14:41:01 -07:00

langwell_udc.h

USB: Add Intel Langwell USB Device Controller driver

2009-06-15 21:44:47 -07:00

m66592.h

usb: m66592-udc platform data on_chip support

2009-07-23 13:04:15 +09:00

midi.h

USB: Standardize inclusion protection and add where missing.

2008-04-24 21:16:42 -07:00

musb.h

USB: musb: Prevent multiple includes of musb.h

2009-04-23 14:15:28 -07:00

net2280.h

USB: Standardize inclusion protection and add where missing.

2008-04-24 21:16:42 -07:00

otg.h

USB: nop-usb-xceiv: behave when linked as a module

2009-06-15 21:44:40 -07:00

quirks.h

USB delay init quirk for logitech Harmony 700-series devices

2010-08-13 13:19:42 -07:00

r8a66597.h

usb: move r8a66597 register defines

2009-07-23 13:04:10 +09:00

rndis_host.h

rndis_wlan: handle 802.11 indications from device

2009-08-04 16:44:17 -04:00

serial.h

USB: serial: don't call release without attach

2009-10-09 13:52:05 -07:00

sl811.h

USB: Standardize inclusion protection and add where missing.

2008-04-24 21:16:42 -07:00

tmc.h

USB: add USB test and measurement class driver

2008-10-17 14:40:51 -07:00

usbnet.h

smsc95xx: fix transmission where ZLP is expected

2009-09-22 14:28:26 -07:00

video.h

V4L/DVB (12187): uvcvideo: Move UVC definitions to linux/usb/video.h

2009-09-12 12:17:19 -03:00

vstusb.h

usb: vstusb.c : new driver for spectrometers used by Vernier Software & Technology, Inc.

2008-10-17 14:41:01 -07:00

wusb-wa.h

wusb: do a proper channel stop

2008-10-28 12:08:46 +00:00

wusb.h

trivial: wusb: Storage class should be before const qualifier

2009-03-30 15:22:03 +02:00