Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
commit817b33d38f81c8736d39283c35c886ae4668f1af
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 1 Oct 2009 00:36:45 +0000 (30 17:36 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 1 Oct 2009 00:36:45 +0000 (30 17:36 -0700)
tree64f60a88baf8b48c350d680f8b69fa6c759c3a82
parent84d88d5d4efc37dfb8a93a4a58d8a227ee86ffa4
parent8c185ab6185bf5e67766edb000ce428269364c86
Merge git://git./linux/kernel/git/davem/net-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
  ax25: Fix possible oops in ax25_make_new
  net: restore tx timestamping for accelerated vlans
  Phonet: fix mutex imbalance
  sit: fix off-by-one in ipip6_tunnel_get_prl
  net: Fix sock_wfree() race
  net: Make setsockopt() optlen be unsigned.
net/packet/af_packet.c