diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-01-31 16:58:12 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-01-31 16:58:12 -0800 |
| commit | 190ff5b3a168b666925897558998b5d97fec8731 (patch) | |
| tree | 9c87169011f48e1ef10a46fcb2050a8795c69161 /fs/ocfs2 | |
| parent | 6fd6b17c6d9713f56b5f20903ec3e00fa6cc435e (diff) | |
| parent | 2e5530236645a042e1481aa19879b819c3e8f5c9 (diff) | |
| download | op-kernel-dev-190ff5b3a168b666925897558998b5d97fec8731.zip op-kernel-dev-190ff5b3a168b666925897558998b5d97fec8731.tar.gz | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
[NETFILTER]: xt_hashlimit: fix ip6tables dependency
[SCTP]: Force update of the rto when processing HB-ACK
[IPV6]: fix BUG of ndisc_send_redirect()
[IPV6]: Fix up some CONFIG typos
[NETFILTER]: SIP conntrack: fix out of bounds memory access
[NETFILTER]: SIP conntrack: fix skipping over user info in SIP headers
[NETFILTER]: xt_connbytes: fix division by zero
[MAINTAINERS]: netfilter@ is subscribers-only
Diffstat (limited to 'fs/ocfs2')
0 files changed, 0 insertions, 0 deletions
