diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-11 20:42:27 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-11 20:42:27 +0200 |
| commit | 5eea7ee2075b245d505285bb422e2fa8d686e5c8 (patch) | |
| tree | 2a2c6e67cfbf8fb6f40b6b5c41c63617f2f0ae6a /drivers/net/gianfar.c | |
| parent | Merge master.kernel.org:/home/rmk/linux-2.6-mmc (diff) | |
| parent | usbtouchscreen: fix ITM data reading (diff) | |
| download | linux-5eea7ee2075b245d505285bb422e2fa8d686e5c8.tar.xz linux-5eea7ee2075b245d505285bb422e2fa8d686e5c8.zip | |
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:
usbtouchscreen: fix ITM data reading
USB: New device ID for ftdi_sio usb serial driver
USB: Support for USB20SVGA-WH & USB20SVGA-DG
USB: hid-core.c: fix duplicate USB_DEVICE_ID_GTCO_404
Diffstat (limited to 'drivers/net/gianfar.c')
0 files changed, 0 insertions, 0 deletions