]> err.no Git - linux-2.6/commit
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 21 Jun 2008 15:44:08 +0000 (08:44 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 21 Jun 2008 15:44:08 +0000 (08:44 -0700)
commita19214430d27a3af6f1672ec26f3c893ef899ede
treeecd998eaf216f6e195c65cb050f4335db86b26f6
parentb732d9680b7a2968823851f1163507ad9c45c8cb
parentb9f75f45a6b46a0ab4eb0857d437a0845871f314
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