diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-11-03 12:28:27 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-11-03 12:28:27 -0800 |
| commit | ced3985faebc232deec0dd9cc375cb5a43d18391 (patch) | |
| tree | 373ec11d9af6046dbb81e08c7317d1a8eea63a69 /drivers/ata/pata_artop.c | |
| parent | f1f2d8713d16a1e198880bbc716eb24fae09c858 (diff) | |
| parent | 18ee91fa9815fa3bb4e51cdcb8229bd0a0f11a70 (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: use MII hooks only if CONFIG_MII is enabled
USB Storage: unusual_devs.h entry for Sony Ericsson P990i
USB: xpad: additional USB id's added
USB: fix compiler issues with newer gcc versions
USB: HID: add blacklist AIRcable USB, little beautification
USB: usblp: fix system suspend for some systems
USB: failure in usblp's error path
usbtouchscreen: use endpoint address from endpoint descriptor
USB: sierra: Fix id for Sierra Wireless MC8755 in new table
USB: new VID/PID-combos for cp2101
hid-core: big-endian fix fix
USB: usb-storage: Unusual_dev update
USB: add another sierra wireless device id
Diffstat (limited to 'drivers/ata/pata_artop.c')
0 files changed, 0 insertions, 0 deletions