Merge gregkh@master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Browse source

...

This commit is contained in:

Greg Kroah-Hartman 2006-08-05 23:22:42 -07:00

parent bce896984c 558e10a57d

commit c34c07d694

7 changed files with 22 additions and 23 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

2

include/net/red.h

View file

2

net/bridge/br_netlink.c

View file

3

net/ipv4/tcp_input.c

View file

12

net/lapb/lapb_iface.c

View file

20

net/llc/af_llc.c

View file

4

net/llc/llc_sap.c

View file

2

net/sched/sch_api.c

View file