80b7a2968823851f1163507ad9c45c8cb parent b9f75f45a6b46a0ab4eb0857d437a0845871f314 author Linus Torvalds 1214063048 -0700 committer Linus Torvalds 1214063048 -0700 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: netns: Don't receive new packets in a dead network namespace. sctp: Make sure N * sizeof(union sctp_addr) does not overflow. pppoe: warning fix ipv6: Drop packets for loopback address from outside of the box. ipv6: Remove options header when setsockopt's optlen is 0 mac80211: detect driver tx bugs ;X