Skip to contentSkip to conversation

: Merge Andrea Bittau CCID2 work

PATCH Applied Arnaldo Carvalho de Melo 1 participant 1 message Sep 14, 2006

lore
Share & tools
lore
#0 lore raw

cover : Merge Andrea Bittau CCID2 work

Hi David,

Please consider pulling from:

master.kernel.org:/pub/scm/linux/kernel/git/acme/net-2.6.19.git

Best Regards,

- Arnaldo

 b/net/dccp/ackvec.c      |   12 +--
 b/net/dccp/ackvec.h      |    4 -
 b/net/dccp/ccids/Kconfig |    8 ++
 b/net/dccp/ccids/ccid2.c |   31 ++++++--
 b/net/dccp/ccids/ccid2.h |    2 
 net/dccp/ackvec.c        |    8 --
 net/dccp/ccids/ccid2.c   |  173 ++++++++++++++++++++++++++++++-----------------
 net/dccp/ccids/ccid2.h   |    7 +
 8 files changed, 160 insertions(+), 85 deletions(-)