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

Browse source

...

This commit is contained in:

David S. Miller 2011-08-01 00:09:40 -07:00

parent 3da3f872aa 384b90abeb

commit 1b4c8af8d2

7 changed files with 23 additions and 7 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

3

MAINTAINERS

View file

8

drivers/connector/cn_proc.c

View file

1

drivers/net/r8169.c

View file

12

drivers/net/sis190.c

View file

1

net/netfilter/ipvs/ip_vs_ctl.c

View file

1

net/sunrpc/xprt.c

View file

4

net/xfrm/xfrm_algo.c

View file