diff options
| author | Linus Torvalds <[email protected]> | 2011-07-03 18:12:21 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2011-07-03 18:12:21 +0000 |
| commit | 070f944a0bb9dd27772fa232bd7648ccc5780548 (patch) | |
| tree | 9efa45dff3e8d61e2c8ab7c6caa3bc53cfe44b8e /net/lapb/lapb_iface.c | |
| parent | Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/g... (diff) | |
| parent | cifs: set socket send and receive timeouts before attempting connect (diff) | |
| download | kernel-070f944a0bb9dd27772fa232bd7648ccc5780548.tar.gz kernel-070f944a0bb9dd27772fa232bd7648ccc5780548.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
cifs: set socket send and receive timeouts before attempting connect
Diffstat (limited to 'net/lapb/lapb_iface.c')
0 files changed, 0 insertions, 0 deletions