Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Browse source

...

This commit is contained in:

David S. Miller 2010-11-08 12:38:28 -08:00

parent a7bcf21e60 aa58163a76

commit d0eaeec8e8

11 changed files with 35 additions and 61 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

1

drivers/atm/solos-attrlist.c

View file

8

drivers/atm/solos-pci.c

View file

1

drivers/net/skge.c

View file

9

drivers/s390/net/qeth_core.h

View file

55

drivers/s390/net/qeth_core_main.c

View file

5

include/linux/netdevice.h

View file

1

include/net/dst_ops.h

View file

6

net/core/pktgen.c

View file

2

net/ipv6/reassembly.c

View file

4

net/rds/message.c

View file

4

net/sched/cls_basic.c

View file