Linus Torvalds 7a9b149212 Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 ... * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (229 commits) USB: remove unused usb_buffer_alloc and usb_buffer_free macros usb: musb: update gfp/slab.h includes USB: ftdi_sio: fix legacy SIO-device header USB: kl5usb105: reimplement using generic framework USB: kl5usb105: minor clean ups USB: kl5usb105: fix memory leak USB: io_ti: use kfifo to implement write buffering USB: io_ti: remove unsused private counter USB: ti_usb: use kfifo to implement write buffering USB: ir-usb: fix incorrect write-buffer length USB: aircable: fix incorrect write-buffer length USB: safe_serial: straighten out read processing USB: safe_serial: reimplement read using generic framework USB: safe_serial: reimplement write using generic framework usb-storage: always print quirks USB: usb-storage: trivial debug improvements USB: oti6858: use port write fifo USB: oti6858: use kfifo to implement write buffering USB: cypress_m8: use kfifo to implement write buffering USB: cypress_m8: remove unused drain define ... Fix up conflicts (due to usb_buffer_alloc/free renaming) in drivers/input/tablet/acecad.c drivers/input/tablet/kbtab.c drivers/input/tablet/wacom_sys.c drivers/media/video/gspca/gspca.c sound/usb/usbaudio.c		2010-05-20 21:26:12 -07:00
..
debugfs-kmemtrace	kmemtrace: Fix typos in documentation.	2008-12-29 15:34:09 +02:00
debugfs-pktcdvd	doc: use correct debugfs mountpoint	2009-04-13 15:04:33 -07:00
ima_policy	ima: rename PATH_CHECK to FILE_CHECK	2010-02-07 03:06:23 -05:00
procfs-diskstats	tree-wide: fix assorted typos all over the place	2009-12-04 15:39:55 +01:00
sysfs-block	block: Added in stricter no merge semantics for block I/O	2010-01-29 09:04:08 +01:00
sysfs-bus-css	[S390] cio: Introduce modalias for css bus.	2008-07-14 10:02:05 +02:00
sysfs-bus-pci	PCI: expose function reset capability in sysfs	2009-09-09 13:29:24 -07:00
sysfs-bus-pci-devices-cciss	cciss: Add usage_count attribute to each logical drive in /sys	2009-10-01 21:15:44 +02:00
sysfs-bus-umc	uwb: document UWB and WUSB sysfs files	2008-09-17 16:54:35 +01:00
sysfs-bus-usb	USB: deprecate the power/level sysfs attribute	2010-05-20 13:21:37 -07:00
sysfs-bus-usb-devices-usbsevseg	USB: Added driver for a Delcom USB 7-segment LED Display	2008-10-17 14:40:51 -07:00
sysfs-c2port	Add c2 port support	2008-11-12 17:17:18 -08:00
sysfs-class
sysfs-class-bdi	fuse: fix bdi naming conflict	2008-05-24 09:56:07 -07:00
sysfs-class-lcd	video/lcd: document sysfs interface	2009-08-28 15:21:12 -04:00
sysfs-class-led	led: document sysfs interface	2009-08-28 15:21:12 -04:00
sysfs-class-mtd	Documentation: add MTD sysfs docs	2009-05-29 15:13:04 +01:00
sysfs-class-pktcdvd
sysfs-class-regulator	regulator: add get_status()	2009-03-31 09:56:20 +01:00
sysfs-class-uwb_rc	uwb: add basic radio manager	2008-11-19 14:46:33 +00:00
sysfs-class-uwb_rc-wusbhc	USB: wusb: add wusb_phy_rate sysfs file to host controllers	2009-12-11 11:55:16 -08:00
sysfs-dev	sysfs: add /sys/dev/{char,block} to lookup sysfs path by major:minor	2008-07-21 21:54:40 -07:00
sysfs-devices
sysfs-devices-memory	Documentation/: it's -> its where appropriate	2010-04-23 02:09:52 +02:00
sysfs-devices-platform-_UDC_-gadget	USB: Composite framework: Add suspended sysfs entry	2010-05-20 13:21:39 -07:00
sysfs-devices-power	PM: Add facility for advanced testing of async suspend/resume	2010-02-26 20:39:10 +01:00
sysfs-devices-system-cpu	Documentation: ABI: /sys/devices/system/cpu/cpu#/node	2009-12-15 08:53:18 -08:00
sysfs-firmware-acpi	ACPI: add /sys/firmware/acpi/interrupts/sci_not counter	2009-04-21 00:35:47 -04:00
sysfs-firmware-memmap	Bernhard has moved	2009-02-18 15:37:56 -08:00
sysfs-firmware-sgi_uv	sysfs: document files in /sys/firmware/sgi_uv/	2008-09-02 19:21:40 -07:00
sysfs-fs-ext4	ext4: teach the inode allocator to use a goal inode number	2009-06-13 11:45:35 -04:00
sysfs-gpio	gpiolib: allow poll() on value	2009-09-23 07:39:48 -07:00
sysfs-ibft
sysfs-kernel-mm	mm: create /sys/kernel/mm	2008-07-24 10:47:17 -07:00
sysfs-kernel-mm-hugepages	hugetlb: new sysfs interface	2008-07-24 10:47:17 -07:00
sysfs-kernel-slab	slub: allow stats to be cleared	2009-10-15 21:34:12 +03:00
sysfs-kernel-uids
sysfs-memory-page-offline	HWPOISON: Add soft page offline support	2009-12-16 12:20:00 +01:00
sysfs-ocfs2
sysfs-platform-asus-laptop	asus-laptop: set the right paths in the documentation	2010-02-28 19:35:09 +01:00
sysfs-platform-eeepc-laptop	eeepc-laptop: set the right paths in the documentation	2010-02-28 19:30:57 +01:00
sysfs-power	PM: Add a switch for disabling/enabling asynchronous suspend/resume	2010-02-26 20:39:10 +01:00
sysfs-pps	LinuxPPS: core support	2009-06-18 13:04:04 -07:00
sysfs-profiling	profiling: dynamically enable readprofile at runtime	2008-10-16 11:21:31 -07:00
sysfs-wusb_cbaf	uwb: document UWB and WUSB sysfs files	2008-09-17 16:54:35 +01:00