diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-28 08:32:25 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-28 08:32:25 -0700 |
commit | 4f31f3080943c7e3541f07df326f06d598a067d0 (patch) | |
tree | e7455c1a8a3991d1e16690a8cf2f7d4f0dd55836 /include/asm-sparc64/fbio.h | |
parent | 1486361777b3ce5ead414d9b2d9fc46f9cd86e0b (diff) | |
parent | 281c7413ed914623d3245299a4761b6b27ab9fdb (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:
net: missing bits of net-namespace / sysctl
ipcomp: Fix warnings after ipcomp consolidation.
dccp: Add check for truncated ICMPv6 DCCP error packets
dccp: Fix incorrect length check for ICMPv4 packets
dccp: Add check for sequence number in ICMPv6 message
dccp: Fix sequence number check for ICMPv4 packets
dccp: Bug-Fix - AWL was never updated
dccp: Allow to distinguish original and retransmitted packets
Diffstat (limited to 'include/asm-sparc64/fbio.h')
0 files changed, 0 insertions, 0 deletions