diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-21 09:13:03 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-21 09:13:03 +0200 |
| commit | c21fd1a8c68ce3f49b00caf10337169262cfb8ad (patch) | |
| tree | 37bb9c0511ece948cc3913f4df21166768379f5e /fs | |
| parent | VFS: move BUG_ON test for symlink nd->depth after current->link_count test (diff) | |
| parent | sctp: Fix build failure. (diff) | |
| download | linux-c21fd1a8c68ce3f49b00caf10337169262cfb8ad.tar.xz linux-c21fd1a8c68ce3f49b00caf10337169262cfb8ad.zip | |
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')
0 files changed, 0 insertions, 0 deletions