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

Browse source

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
  sctp: Fix build failure.
  garp: use kfree_rcu()
  ipv6: copy prefsrc setting when copying route entry

...

This commit is contained in:

Linus Torvalds 2011-05-21 00:13:03 -07:00

parent 1a4022f88d 5d41452166

commit c21fd1a8c6

3 changed files with 4 additions and 19 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

20

net/802/garp.c

View file

1

net/ipv6/route.c

View file

2

net/sctp/bind_addr.c

View file