summaryrefslogtreecommitdiffstats
path: root/include/asm-frv
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-01-31 16:58:12 -0800
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-01-31 16:58:12 -0800
commit190ff5b3a168b666925897558998b5d97fec8731 (patch)
tree9c87169011f48e1ef10a46fcb2050a8795c69161 /include/asm-frv
parent6fd6b17c6d9713f56b5f20903ec3e00fa6cc435e (diff)
parent2e5530236645a042e1481aa19879b819c3e8f5c9 (diff)
downloadop-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 'include/asm-frv')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud