diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-08-02 20:25:35 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-08-02 20:25:35 -0700 |
commit | 90eb29efd0ca9301d80d03ea13662d32436f060e (patch) | |
tree | 4d019d931c99dc4b91e516ea181aabcbb36528b4 /net/ipv4/ipcomp.c | |
parent | 1398ab7cb92b21d8d5add3bdc25b2c00462cfd5c (diff) | |
parent | cae74b30dd98c10baa5b47b4698bf67e5eb15687 (diff) | |
download | kernel_samsung_espresso10-90eb29efd0ca9301d80d03ea13662d32436f060e.zip kernel_samsung_espresso10-90eb29efd0ca9301d80d03ea13662d32436f060e.tar.gz kernel_samsung_espresso10-90eb29efd0ca9301d80d03ea13662d32436f060e.tar.bz2 |
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: (24 commits)
Revert "[PATCH] USB: move usb_device_class class devices to be real devices"
Revert "[PATCH] USB: convert usb class devices to real devices"
USB: UHCI: Don't test the Short Packet Detect bit
USB: unusual_devs entry for Nokia 3250
USB: dummy-hcd: disable interrupts during req->complete
USB: fix the USB_GADGET_DUMMY_HCD dependencies
USB: ati_remote.c: autorepeat fix
USB: doc: fixes devio.c location in proc_usb_info.txt.
USB: doc: usb-help.txt update.
USB: Patch for rtl8150 to fix unplug problems
USB: cypress driver comment updates
USB: unusual_devs device removal
usb-storage: Add US_FL_IGNORE_DEVICE flag; ignore ZyXEL G220F
USB: New USB ID for Belkin Serial Adapter
USB: Additional PID for the ftdi_sio driver
USB: adding support for SHARP WS003SH to ipaq.c
USB: Fix Freescale high-speed USB host dependency
USB: Removed 3-port device handler from Option driver
USB: Drop Sierra Wireless MC8755 from the Option driver
USB: Let option driver handle Anydata CDMA modems. Remove anydata driver.
...
Diffstat (limited to 'net/ipv4/ipcomp.c')
0 files changed, 0 insertions, 0 deletions