diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-26 11:41:08 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-26 11:41:08 -0800 |
| commit | 92320cec611d4ed44a9bd635727d61f6caa669a7 (patch) | |
| tree | e5cfe51e7134ea62cc82e59aaf28f191ef4a2543 /drivers/char/consolemap.c | |
| parent | 63ae0e5be34cb7593fc5f1135422129f765ac3ef (diff) | |
| parent | 19c262391c4741b012a5031fc438fb694e77c385 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6:
USB: export autosuspend delay in sysfs
sysfs: allow attributes to be added to groups
USB: make autosuspend delay a module parameter
USB: minor cleanups for sysfs.c
USB: add a blacklist for devices that can't handle some things we throw at them.
USB: refactor usb device matching and create usb_device_match
USB: Wacom driver updates
gadgetfs: Fixed bug in ep_aio_read_retry.
USB: Use USB defines in usbmouse.c and usbkbd.c
USB: add rationale on why usb descriptor structures have to be packed
USB: ftdi_sio: Adding VID and PID for Tellstick
UHCI: Eliminate asynchronous skeleton Queue Headers
UHCI: Add macros for computing DMA values
USB: Davicom DM9601 usbnet driver
USB: asix.c - Add JVC-PRX1 ids
usbmon: Remove erroneous __exit
USB: add driver for iowarrior devices.
USB: option: add a bunch of new device ids
USB: option: remove duplicate device id table
Diffstat (limited to 'drivers/char/consolemap.c')
0 files changed, 0 insertions, 0 deletions