diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-21 00:13:03 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-21 00:13:03 -0700 |
| commit | c21fd1a8c68ce3f49b00caf10337169262cfb8ad (patch) | |
| tree | 37bb9c0511ece948cc3913f4df21166768379f5e /fs/gfs2 | |
| parent | 1a4022f88d40e1255920b017556092ab926d7f66 (diff) | |
| parent | 5d414521663295ce25c90164f4d41a07ac846468 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* 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
Diffstat (limited to 'fs/gfs2')
0 files changed, 0 insertions, 0 deletions