Merge master.kernel.org:/pub/scm/linux/kernel/git/acme/llc-2.6
Showing
- include/linux/sysctl.h 25 additions, 1 deletioninclude/linux/sysctl.h
- include/net/llc.h 30 additions, 0 deletionsinclude/net/llc.h
- include/net/llc_conn.h 8 additions, 7 deletionsinclude/net/llc_conn.h
- include/net/llc_sap.h 6 additions, 2 deletionsinclude/net/llc_sap.h
- net/802/p8022.c 1 addition, 1 deletionnet/802/p8022.c
- net/802/psnap.c 1 addition, 1 deletionnet/802/psnap.c
- net/802/tr.c 1 addition, 1 deletionnet/802/tr.c
- net/core/dev.c 2 additions, 0 deletionsnet/core/dev.c
- net/llc/Makefile 1 addition, 0 deletionsnet/llc/Makefile
- net/llc/af_llc.c 302 additions, 199 deletionsnet/llc/af_llc.c
- net/llc/llc_c_ac.c 98 additions, 173 deletionsnet/llc/llc_c_ac.c
- net/llc/llc_c_ev.c 68 additions, 89 deletionsnet/llc/llc_c_ev.c
- net/llc/llc_conn.c 123 additions, 89 deletionsnet/llc/llc_conn.c
- net/llc/llc_core.c 23 additions, 11 deletionsnet/llc/llc_core.c
- net/llc/llc_if.c 5 additions, 6 deletionsnet/llc/llc_if.c
- net/llc/llc_input.c 14 additions, 5 deletionsnet/llc/llc_input.c
- net/llc/llc_output.c 1 addition, 1 deletionnet/llc/llc_output.c
- net/llc/llc_proc.c 1 addition, 1 deletionnet/llc/llc_proc.c
- net/llc/llc_s_ac.c 7 additions, 9 deletionsnet/llc/llc_s_ac.c
- net/llc/llc_sap.c 13 additions, 7 deletionsnet/llc/llc_sap.c
Please register or sign in to comment