diff options
| author | David Howells <dhowells@redhat.com> | 2006-12-05 09:37:56 -0500 |
|---|---|---|
| committer | David Howells <dhowells@warthog.cambridge.redhat.com> | 2006-12-05 09:37:56 -0500 |
| commit | 4c1ac1b49122b805adfa4efc620592f68dccf5db (patch) | |
| tree | 87557f4bc2fd4fe65b7570489c2f610c45c0adcd /net/wanrouter/af_wanpipe.c | |
| parent | c4028958b6ecad064b1a6303a6a5906d4fe48d73 (diff) | |
| parent | d916faace3efc0bf19fe9a615a1ab8fa1a24cd93 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
drivers/infiniband/core/iwcm.c
drivers/net/chelsio/cxgb2.c
drivers/net/wireless/bcm43xx/bcm43xx_main.c
drivers/net/wireless/prism54/islpci_eth.c
drivers/usb/core/hub.h
drivers/usb/input/hid-core.c
net/core/netpoll.c
Fix up merge failures with Linus's head and fix new compilation failures.
Signed-Off-By: David Howells <dhowells@redhat.com>
Diffstat (limited to 'net/wanrouter/af_wanpipe.c')
| -rw-r--r-- | net/wanrouter/af_wanpipe.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/wanrouter/af_wanpipe.c b/net/wanrouter/af_wanpipe.c index 6f39faa15832..c2059733e15a 100644 --- a/net/wanrouter/af_wanpipe.c +++ b/net/wanrouter/af_wanpipe.c | |||
| @@ -13,7 +13,7 @@ | |||
| 13 | * Due Credit: | 13 | * Due Credit: |
| 14 | * Wanpipe socket layer is based on Packet and | 14 | * Wanpipe socket layer is based on Packet and |
| 15 | * the X25 socket layers. The above sockets were | 15 | * the X25 socket layers. The above sockets were |
| 16 | * used for the specific use of Sangoma Technoloiges | 16 | * used for the specific use of Sangoma Technologies |
| 17 | * API programs. | 17 | * API programs. |
| 18 | * Packet socket Authors: Ross Biro, Fred N. van Kempen and | 18 | * Packet socket Authors: Ross Biro, Fred N. van Kempen and |
| 19 | * Alan Cox. | 19 | * Alan Cox. |
| @@ -23,7 +23,7 @@ | |||
| 23 | * Apr 25, 2000 Nenad Corbic o Added the ability to send zero length packets. | 23 | * Apr 25, 2000 Nenad Corbic o Added the ability to send zero length packets. |
| 24 | * Mar 13, 2000 Nenad Corbic o Added a tx buffer check via ioctl call. | 24 | * Mar 13, 2000 Nenad Corbic o Added a tx buffer check via ioctl call. |
| 25 | * Mar 06, 2000 Nenad Corbic o Fixed the corrupt sock lcn problem. | 25 | * Mar 06, 2000 Nenad Corbic o Fixed the corrupt sock lcn problem. |
| 26 | * Server and client applicaton can run | 26 | * Server and client application can run |
| 27 | * simultaneously without conflicts. | 27 | * simultaneously without conflicts. |
| 28 | * Feb 29, 2000 Nenad Corbic o Added support for PVC protocols, such as | 28 | * Feb 29, 2000 Nenad Corbic o Added support for PVC protocols, such as |
| 29 | * CHDLC, Frame Relay and HDLC API. | 29 | * CHDLC, Frame Relay and HDLC API. |