David Vrabel b21a207141 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-upstream ...

Conflicts:

	drivers/uwb/wlp/eda.c

2009-01-02 13:17:13 +00:00

..

association.h

…

atmel_usba_udc.h

…

audio.h

…

c67x00.h

…

cdc.h

usb gadget: cdc obex glue

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

ch9.h

USB: fix comment about endianness of descriptors

2008-12-17 10:49:14 -08:00

composite.h

…

ehci_def.h

…

g_printer.h

…

gadget.h

…

gadgetfs.h

…

input.h

…

iowarrior.h

…

irda.h

…

isp116x.h

…

Kbuild

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

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

midi.h

…

musb.h

…

net2280.h

…

otg.h

…

quirks.h

…

rndis_host.h

…

serial.h

USB: Fix spelling in usb/serial.h

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

sl811.h

…

tmc.h

…

usbnet.h

…

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

…